diff options
| author | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-06 20:43:44 +0000 |
|---|---|---|
| committer | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-06 20:43:44 +0000 |
| commit | 6d20d4747e424104dd104871ce0eb51cc5c5f9b7 (patch) | |
| tree | 100f2ea8df26139b4819e38db8b5419828d1852c /target | |
| parent | 9d1da6b4dc70f963433e871ff5027be97c4ca080 (diff) | |
Fix merge error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17534 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -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 e64dc4b1b..4077ebe1f 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; + |