From cfd409ad80000cc3353dd3fc99a7172555f5bb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BCsch?= Date: Sun, 6 Sep 2009 20:43:44 +0000 Subject: Fix merge error git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17534 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/brcm47xx') 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; + -- cgit v1.2.3