diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 10:53:23 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 10:53:23 +0000 |
commit | 104b3386a23c4179fb3a993bed106c256625a70d (patch) | |
tree | 2fe999020575731d650df26a0a188e045f2db29e /target/linux/ar71xx | |
parent | bdfc0556b878cc06a0741983227a8f166079c50d (diff) | |
download | upstream-104b3386a23c4179fb3a993bed106c256625a70d.tar.gz upstream-104b3386a23c4179fb3a993bed106c256625a70d.tar.bz2 upstream-104b3386a23c4179fb3a993bed106c256625a70d.zip |
update to 2.6.25.12
SVN-Revision: 11933
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r-- | target/linux/ar71xx/Makefile | 2 | ||||
-rw-r--r-- | target/linux/ar71xx/patches/003-ar71xx_usb_host.patch | 2 | ||||
-rw-r--r-- | target/linux/ar71xx/patches/900-mips_multi_machine_support.patch | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 849f4c2155..0aa715da43 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -11,7 +11,7 @@ BOARD:=ar71xx BOARDNAME:=Atheros AR71xx FEATURES:=squashfs tgz broken -LINUX_VERSION:=2.6.25.10 +LINUX_VERSION:=2.6.25.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches/003-ar71xx_usb_host.patch index 33b24750ea..60c0d1eafc 100644 --- a/target/linux/ar71xx/patches/003-ar71xx_usb_host.patch +++ b/target/linux/ar71xx/patches/003-ar71xx_usb_host.patch @@ -47,7 +47,7 @@ --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1057,6 +1057,11 @@ - #define PLATFORM_DRIVER ohci_hcd_sm501_driver + #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver #endif +#ifdef CONFIG_USB_OHCI_AR71XX diff --git a/target/linux/ar71xx/patches/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches/900-mips_multi_machine_support.patch index 8932ba620f..1d9a601654 100644 --- a/target/linux/ar71xx/patches/900-mips_multi_machine_support.patch +++ b/target/linux/ar71xx/patches/900-mips_multi_machine_support.patch @@ -123,7 +123,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -700,6 +700,7 @@ +@@ -701,6 +701,7 @@ endchoice @@ -131,7 +131,7 @@ source "arch/mips/au1000/Kconfig" source "arch/mips/basler/excite/Kconfig" source "arch/mips/jazz/Kconfig" -@@ -857,6 +858,9 @@ +@@ -858,6 +859,9 @@ config MIPS_DISABLE_OBSOLETE_IDE bool |