projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1941a86)
Fix merge error
authorMichael Büsch <mb@bu3sch.de>
Sun, 6 Sep 2009 20:43:44 +0000 (20:43 +0000)
committerMichael Büsch <mb@bu3sch.de>
Sun, 6 Sep 2009 20:43:44 +0000 (20:43 +0000)
SVN-Revision: 17534

target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch patch | blob | history

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 e64dc4b1bd02a954d235d8d48bb4ec6fb8feb0bd..4077ebe1f98717f3fc6d91d4fddc525a4a486b6d 100644 (file)
--- 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;
 +