diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-22 15:37:19 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-22 15:37:19 +0000 |
| commit | 679527596194ec4222e9379d386061ada4744900 (patch) | |
| tree | 074f7229f0cedb176a1a09354cbf032ed532b025 /target/linux/atheros | |
| parent | ac9bdf20c8c0e8f419cff3061aa1e3459c6c4e1e (diff) | |
[kernel] update to 2.6.26.3 and 2.6.25.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12371 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros')
4 files changed, 9 insertions, 13 deletions
diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 1544f8216..e4e2a423c 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros 231x/5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.26.2 +LINUX_VERSION:=2.6.26.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/patches-2.6.26/120-watchdog.patch b/target/linux/atheros/patches-2.6.26/120-watchdog.patch index 64ac6871c..d99b8c781 100644 --- a/target/linux/atheros/patches-2.6.26/120-watchdog.patch +++ b/target/linux/atheros/patches-2.6.26/120-watchdog.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.26.2/drivers/watchdog/Kconfig -=================================================================== ---- linux-2.6.26.2.orig/drivers/watchdog/Kconfig 2008-08-14 16:54:30.000000000 +0200 -+++ linux-2.6.26.2/drivers/watchdog/Kconfig 2008-08-14 16:55:40.000000000 +0200 +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig @@ -683,6 +683,12 @@ help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. @@ -15,10 +13,8 @@ Index: linux-2.6.26.2/drivers/watchdog/Kconfig # PARISC Architecture # POWERPC Architecture -Index: linux-2.6.26.2/drivers/watchdog/Makefile -=================================================================== ---- linux-2.6.26.2.orig/drivers/watchdog/Makefile 2008-08-14 16:55:44.000000000 +0200 -+++ linux-2.6.26.2/drivers/watchdog/Makefile 2008-08-14 16:58:16.000000000 +0200 +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile @@ -97,6 +97,7 @@ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o diff --git a/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch b/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch index e3a30d887..97d3f1c38 100644 --- a/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch +++ b/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch @@ -1,5 +1,5 @@ ---- a/drivers/net/ar2313/ar2313.c (revisione 11911) -+++ a/drivers/net/ar2313/ar2313.c (copia locale) +--- a/drivers/net/ar2313/ar2313.c ++++ b/drivers/net/ar2313/ar2313.c @@ -291,7 +291,7 @@ sp->mii_bus.write = mdiobus_write; sp->mii_bus.reset = mdiobus_reset; diff --git a/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch index baf8026a3..3e89407d0 100644 --- a/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch +++ b/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c -@@ -59,31 +59,32 @@ +@@ -62,31 +62,32 @@ static char nullstring[] = "unallocated"; #endif @@ -40,7 +40,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -155,6 +156,11 @@ +@@ -158,6 +159,11 @@ } if (i == numslots) { /* Didn't find it */ |