1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

Merge commit 'openwrt-backfire/master' into xburst

Conflicts:

	package/mac80211/patches/120-compat_rcu_dereference.patch
	package/mac80211/patches/130-tracepoint_include_linux_version_h.patch
	target/linux/x86/Makefile
This commit is contained in:
Mirko Vogt
2010-05-12 19:47:13 +02:00
107 changed files with 1184 additions and 1610 deletions

View File

@@ -0,0 +1,18 @@
Index: linux-2.6.32.12/drivers/usb/host/ehci-hub.c
===================================================================
--- linux-2.6.32.12.orig/drivers/usb/host/ehci-hub.c 2010-05-02 21:06:45.000000000 +0200
+++ linux-2.6.32.12/drivers/usb/host/ehci-hub.c 2010-05-02 21:07:08.000000000 +0200
@@ -741,11 +741,13 @@
* power switching; they're allowed to just limit the
* current. khubd will turn the power back on.
*/
+#ifndef CONFIG_BCM63XX
if (HCS_PPC (ehci->hcs_params)){
ehci_writel(ehci,
temp & ~(PORT_RWC_BITS | PORT_POWER),
status_reg);
}
+#endif
}
/* whoever resumes must GetPortStatus to complete it!! */