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

index e64dc4b..4077ebe 100644 (file)
 +      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;
 +