From: Michael Büsch <mb@bu3sch.de>
Date: Sun, 6 Sep 2009 20:43:44 +0000 (+0000)
Subject: Fix merge error
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=caa8d2f9dc05542a2ab0f507a9cb0589b3f1f156;p=openwrt%2Fstaging%2Flinusw.git

Fix merge error

SVN-Revision: 17534
---

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;
 +