diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-03 14:16:25 +0200 |
| commit | cb2e3d461b26f07540e0b898e0125137def2b015 (patch) | |
| tree | a7d3c7f79bd26b15806565405522c7c7c0da44db /drivers/usb/phy | |
| parent | d30eed1cd2b17f6140ec443f22a8e32f99cd99c1 (diff) | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
| download | linux-cb2e3d461b26f07540e0b898e0125137def2b015.tar.gz linux-cb2e3d461b26f07540e0b898e0125137def2b015.tar.bz2 linux-cb2e3d461b26f07540e0b898e0125137def2b015.zip | |
Merge 4.11-rc5 into usb-next
We want the usb fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-isp1301.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-isp1301.c b/drivers/usb/phy/phy-isp1301.c index b3b33cf7ddf6..f333024660b4 100644 --- a/drivers/usb/phy/phy-isp1301.c +++ b/drivers/usb/phy/phy-isp1301.c @@ -136,7 +136,7 @@ static int isp1301_remove(struct i2c_client *client) static struct i2c_driver isp1301_driver = { .driver = { .name = DRV_NAME, - .of_match_table = of_match_ptr(isp1301_of_match), + .of_match_table = isp1301_of_match, }, .probe = isp1301_probe, .remove = isp1301_remove, |