summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-26 10:53:23 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-26 10:53:23 +0000
commit115a129a30ab1a50d62f8efac868db2380909624 (patch)
tree4a23a5ed448fd40c6f12dbf60c409f6cf6d860ba /target/linux/ar71xx
parentbf6c297d604df4139882975b986685cda0c1ca84 (diff)
[kernel] update to 2.6.25.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/ar71xx/patches/003-ar71xx_usb_host.patch2
-rw-r--r--target/linux/ar71xx/patches/900-mips_multi_machine_support.patch4
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 849f4c215..0aa715da4 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 33b24750e..60c0d1eaf 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 8932ba620..1d9a60165 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