aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000-2.6
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2007-07-29 17:08:06 +0000
committerJohn Crispin <john@openwrt.org>2007-07-29 17:08:06 +0000
commit5a326c97841226b5addd4de3570b1692282320e1 (patch)
tree563f257a252c60a64a28f77b228b9dc4b01389be /target/linux/au1000-2.6
parentdd0a1806eafd0239e7a4b85e3420e711e67d935f (diff)
downloadupstream-5a326c97841226b5addd4de3570b1692282320e1.tar.gz
upstream-5a326c97841226b5addd4de3570b1692282320e1.tar.bz2
upstream-5a326c97841226b5addd4de3570b1692282320e1.zip
improved patch for au1000 usb-power switch
SVN-Revision: 8217
Diffstat (limited to 'target/linux/au1000-2.6')
-rw-r--r--target/linux/au1000-2.6/patches/017-usb-power.patch13
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/au1000-2.6/patches/017-usb-power.patch b/target/linux/au1000-2.6/patches/017-usb-power.patch
index 0bde1f9a3f..c9859c2585 100644
--- a/target/linux/au1000-2.6/patches/017-usb-power.patch
+++ b/target/linux/au1000-2.6/patches/017-usb-power.patch
@@ -1,16 +1,11 @@
-diff -urN linux-2.6.22.1.orig/arch/mips/au1000/mtx-1/board_setup.c linux-2.6.22.1/arch/mips/au1000/mtx-1/board_setup.c
---- linux-2.6.22.1.orig/arch/mips/au1000/mtx-1/board_setup.c 2007-07-24 18:42:22.852011842 +0200
-+++ linux-2.6.22.1/arch/mips/au1000/mtx-1/board_setup.c 2007-07-25 00:39:37.797519773 +0200
-@@ -54,11 +54,10 @@
+--- linux-2.6.22.1.orig/arch/mips/au1000/mtx-1/board_setup.c 2007-07-29 18:57:35.000000000 +0200
++++ linux-2.6.22.1/arch/mips/au1000/mtx-1/board_setup.c 2007-07-29 18:59:48.000000000 +0200
+@@ -54,7 +54,7 @@
void __init board_setup(void)
{
-#ifdef CONFIG_USB_OHCI
++#ifdef CONFIG_USB_OHCI_HCD || CONFIG_USB_OHCI_HCD_MODULE
// enable USB power switch
-+ printk("mtx-1: turning on the usb power switch\n");
au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
au_writel( 0x100000, GPIO2_OUTPUT );
--#endif // defined (CONFIG_USB_OHCI)
-
- #ifdef CONFIG_PCI
- #if defined(__MIPSEB__)