diff options
| author | Michael Büsch <mb@bu3sch.de> | 2009-09-06 20:43:44 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2009-09-06 20:43:44 +0000 |
| commit | caa8d2f9dc05542a2ab0f507a9cb0589b3f1f156 (patch) | |
| tree | 27682b41f54cbe504eac6bf5d7f35f49ae279faa /target/linux/brcm47xx | |
| parent | 1941a86b15aecdcb72060ee1ff8ebaaa482473d6 (diff) | |
| download | upstream-caa8d2f9dc05542a2ab0f507a9cb0589b3f1f156.tar.gz upstream-caa8d2f9dc05542a2ab0f507a9cb0589b3f1f156.tar.bz2 upstream-caa8d2f9dc05542a2ab0f507a9cb0589b3f1f156.zip | |
Fix merge error
SVN-Revision: 17534
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch index e64dc4b1bd..4077ebe1f9 100644 --- a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch @@ -214,7 +214,7 @@ + u32 tmp, flags = 0; + + hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev, -+ dev->dev->bus_id); ++ dev_name(dev->dev)); + if (!hcd) + goto err_dev_disable; + |