KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge error

Browse source 
SVN-Revision: 17534
This commit is contained in:
Michael Büsch 2009-09-06 20:43:44 +00:00
parent 1941a86b15
commit caa8d2f9dc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch
View file

@ -214,7 +214,7 @@
+ u32 tmp, flags = 0; + u32 tmp, flags = 0;
+ +
+ hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev, + hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
+ dev->dev->bus_id); + dev_name(dev->dev));
+ if (!hcd) + if (!hcd)
+ goto err_dev_disable; + goto err_dev_disable;
+ +