From caa8d2f9dc05542a2ab0f507a9cb0589b3f1f156 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20B=C3=BCsch?= Date: Sun, 6 Sep 2009 20:43:44 +0000 Subject: [PATCH] Fix merge error SVN-Revision: 17534 --- target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; + -- 2.25.1