Fix merge error

SVN-Revision: 17534
2009-09-06 20:43:44 +00:00 · 2009-09-06 20:43:44 +00:00 · caa8d2f9dc
commit caa8d2f9dc
parent 1941a86b15
1 changed files with 1 additions and 1 deletions
--- 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;
 +