diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-29 17:12:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-29 17:12:05 +1000 |
| commit | 395c67de43caa02e82d13c9d704295d7c2dc86ca (patch) | |
| tree | fadc2787d4094cbb7bb34808fad70c5a0f1ab8a1 /drivers/usb/host/ehci-spear.c | |
| parent | 78e5ce2c5bdbbf460031e8a59714ad23fa7a1e9e (diff) | |
| parent | d508d992026c8225d529f39795e1ed6d2867bd2c (diff) | |
Merge remote-tracking branch 'usb/usb-next'
Conflicts:
Documentation/devicetree/bindings/phy/samsung-phy.txt
drivers/phy/Kconfig
drivers/phy/Makefile
drivers/phy/phy-samsung-usb2.c
drivers/phy/phy-samsung-usb2.h
drivers/usb/musb/musb_host.c
Diffstat (limited to 'drivers/usb/host/ehci-spear.c')
| -rw-r--r-- | drivers/usb/host/ehci-spear.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index 1d59958ad0ce..1355ff0946b9 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c @@ -150,7 +150,7 @@ static int spear_ehci_hcd_drv_remove(struct platform_device *pdev) return 0; } -static struct of_device_id spear_ehci_id_table[] = { +static const struct of_device_id spear_ehci_id_table[] = { { .compatible = "st,spear600-ehci", }, { }, }; |