From ab47d507d2ff2b0846433bc3c77de03c995258f6 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 15 Oct 2008 19:30:21 +0000 Subject: [kernel] refresh patches against 2.6.27 final git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/atheros/patches-2.6.27/100-board.patch | 6 +++--- target/linux/atheros/patches-2.6.27/110-spiflash.patch | 4 ++-- target/linux/atheros/patches-2.6.27/120-watchdog.patch | 4 ++-- target/linux/atheros/patches-2.6.27/130-ar2313_ethernet.patch | 4 ++-- target/linux/atheros/patches-2.6.27/135-ar2313_2.6.26.patch | 2 +- .../linux/atheros/patches-2.6.27/140-redboot_partition_scan.patch | 4 ++-- target/linux/atheros/patches-2.6.27/150-bridge-printk.patch | 4 ++-- .../linux/atheros/patches-2.6.27/200-ar2313_enable_mvswitch.patch | 6 +++--- .../atheros/patches-2.6.27/901-get_c0_compare_irq_function.patch | 6 +++--- .../atheros/patches-2.6.27/902-mips_clocksource_init_war.patch | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'target/linux/atheros') diff --git a/target/linux/atheros/patches-2.6.27/100-board.patch b/target/linux/atheros/patches-2.6.27/100-board.patch index c5aafc69c7..0c784b4445 100644 --- a/target/linux/atheros/patches-2.6.27/100-board.patch +++ b/target/linux/atheros/patches-2.6.27/100-board.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -59,6 +59,18 @@ +@@ -59,6 +59,18 @@ config BCM47XX help Support for BCM47XX based boards @@ -19,7 +19,7 @@ config MIPS_COBALT bool "Cobalt Server" select CEVT_R4K -@@ -598,6 +610,7 @@ +@@ -598,6 +610,7 @@ config WR_PPMC endchoice @@ -29,7 +29,7 @@ source "arch/mips/jazz/Kconfig" --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -276,6 +276,13 @@ +@@ -276,6 +276,13 @@ libs-$(CONFIG_MIPS_XXS1500) += arch/mips load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 # diff --git a/target/linux/atheros/patches-2.6.27/110-spiflash.patch b/target/linux/atheros/patches-2.6.27/110-spiflash.patch index e8dbc7a052..9ebcf2e511 100644 --- a/target/linux/atheros/patches-2.6.27/110-spiflash.patch +++ b/target/linux/atheros/patches-2.6.27/110-spiflash.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/Kconfig +++ b/drivers/mtd/devices/Kconfig -@@ -83,6 +83,10 @@ +@@ -83,6 +83,10 @@ config M25PXX_USE_FAST_READ help This option enables FAST_READ access supported by ST M25Pxx. @@ -13,7 +13,7 @@ help --- a/drivers/mtd/devices/Makefile +++ b/drivers/mtd/devices/Makefile -@@ -16,3 +16,4 @@ +@@ -16,3 +16,4 @@ obj-$(CONFIG_MTD_LART) += lart.o obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o obj-$(CONFIG_MTD_M25P80) += m25p80.o diff --git a/target/linux/atheros/patches-2.6.27/120-watchdog.patch b/target/linux/atheros/patches-2.6.27/120-watchdog.patch index 6822a6d693..42b3c0d3a6 100644 --- a/target/linux/atheros/patches-2.6.27/120-watchdog.patch +++ b/target/linux/atheros/patches-2.6.27/120-watchdog.patch @@ -1,6 +1,6 @@ --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -704,6 +704,12 @@ +@@ -704,6 +704,12 @@ config TXX9_WDT help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. @@ -15,7 +15,7 @@ # POWERPC Architecture --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -102,6 +102,7 @@ +@@ -102,6 +102,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o diff --git a/target/linux/atheros/patches-2.6.27/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.27/130-ar2313_ethernet.patch index c615a71b90..5b41a52bdd 100644 --- a/target/linux/atheros/patches-2.6.27/130-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-2.6.27/130-ar2313_ethernet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -359,6 +359,12 @@ +@@ -359,6 +359,12 @@ config AX88796_93CX6 help Select this if your platform comes with an external 93CX6 eeprom. @@ -15,7 +15,7 @@ depends on PPC_PMAC && PPC32 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -195,6 +195,7 @@ +@@ -195,6 +195,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_KORINA) += korina.o obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o diff --git a/target/linux/atheros/patches-2.6.27/135-ar2313_2.6.26.patch b/target/linux/atheros/patches-2.6.27/135-ar2313_2.6.26.patch index 97d3f1c387..a39b46c0b8 100644 --- a/target/linux/atheros/patches-2.6.27/135-ar2313_2.6.26.patch +++ b/target/linux/atheros/patches-2.6.27/135-ar2313_2.6.26.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ar2313/ar2313.c +++ b/drivers/net/ar2313/ar2313.c -@@ -291,7 +291,7 @@ +@@ -291,7 +291,7 @@ int __init ar2313_probe(struct platform_ sp->mii_bus.write = mdiobus_write; sp->mii_bus.reset = mdiobus_reset; sp->mii_bus.name = "ar2313_eth_mii"; diff --git a/target/linux/atheros/patches-2.6.27/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.27/140-redboot_partition_scan.patch index a76bd83bb0..289d4eb990 100644 --- a/target/linux/atheros/patches-2.6.27/140-redboot_partition_scan.patch +++ b/target/linux/atheros/patches-2.6.27/140-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c -@@ -60,31 +60,32 @@ +@@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru 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); -@@ -156,6 +157,11 @@ +@@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ diff --git a/target/linux/atheros/patches-2.6.27/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.27/150-bridge-printk.patch index 0c4dd0aa8d..2310bd8f6c 100644 --- a/target/linux/atheros/patches-2.6.27/150-bridge-printk.patch +++ b/target/linux/atheros/patches-2.6.27/150-bridge-printk.patch @@ -1,6 +1,6 @@ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3983,8 +3983,8 @@ +@@ -3984,8 +3984,8 @@ int register_netdevice(struct net_device /* Fix illegal SG+CSUM combinations. */ if ((dev->features & NETIF_F_SG) && !(dev->features & NETIF_F_ALL_CSUM)) { @@ -11,7 +11,7 @@ dev->features &= ~NETIF_F_SG; } -@@ -3997,9 +3997,9 @@ +@@ -3998,9 +3998,9 @@ int register_netdevice(struct net_device } if (dev->features & NETIF_F_UFO) { if (!(dev->features & NETIF_F_HW_CSUM)) { diff --git a/target/linux/atheros/patches-2.6.27/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.27/200-ar2313_enable_mvswitch.patch index 752b07f89c..3868939cd6 100644 --- a/target/linux/atheros/patches-2.6.27/200-ar2313_enable_mvswitch.patch +++ b/target/linux/atheros/patches-2.6.27/200-ar2313_enable_mvswitch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ar2313/ar2313.c +++ b/drivers/net/ar2313/ar2313.c -@@ -953,9 +953,9 @@ +@@ -953,9 +953,9 @@ static int ar2313_rx_int(struct net_devi ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN); dev->stats.rx_bytes += skb->len; @@ -12,7 +12,7 @@ skb_new->dev = dev; /* 16 bit align */ -@@ -1370,6 +1370,8 @@ +@@ -1370,6 +1370,8 @@ static int mdiobus_probe (struct net_dev return PTR_ERR(phydev); } @@ -23,7 +23,7 @@ | SUPPORTED_10baseT_Full --- a/drivers/net/ar2313/ar2313.h +++ b/drivers/net/ar2313/ar2313.h -@@ -107,6 +107,8 @@ +@@ -107,6 +107,8 @@ typedef struct { */ struct ar2313_private { struct net_device *dev; diff --git a/target/linux/atheros/patches-2.6.27/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.27/901-get_c0_compare_irq_function.patch index 32b3ae46d3..eaf2b03fae 100644 --- a/target/linux/atheros/patches-2.6.27/901-get_c0_compare_irq_function.patch +++ b/target/linux/atheros/patches-2.6.27/901-get_c0_compare_irq_function.patch @@ -8,7 +8,7 @@ extern void check_wait(void); extern asmlinkage void r4k_wait(void); -@@ -1484,6 +1485,8 @@ +@@ -1484,6 +1485,8 @@ void __cpuinit per_cpu_trap_init(void) */ if (cpu_has_mips_r2) { cp0_compare_irq = (read_c0_intctl() >> 29) & 7; @@ -19,7 +19,7 @@ cp0_perfcount_irq = -1; --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h -@@ -53,6 +53,7 @@ +@@ -53,6 +53,7 @@ extern int (*perf_irq)(void); #ifdef CONFIG_CEVT_R4K extern int mips_clockevent_init(void); extern unsigned int __weak get_c0_compare_int(void); @@ -29,7 +29,7 @@ { --- a/arch/mips/atheros/board.c +++ b/arch/mips/atheros/board.c -@@ -205,6 +205,11 @@ +@@ -205,6 +205,11 @@ void (*board_time_init)(void); void __init plat_time_init(void) { board_time_init(); } diff --git a/target/linux/atheros/patches-2.6.27/902-mips_clocksource_init_war.patch b/target/linux/atheros/patches-2.6.27/902-mips_clocksource_init_war.patch index 564321c7c8..03a66ff133 100644 --- a/target/linux/atheros/patches-2.6.27/902-mips_clocksource_init_war.patch +++ b/target/linux/atheros/patches-2.6.27/902-mips_clocksource_init_war.patch @@ -23,7 +23,7 @@ * The SMTC Kernel for the 34K, 1004K, et. al. replaces several * of these routines with SMTC-specific variants. */ -@@ -30,6 +46,7 @@ +@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long cnt = read_c0_count(); cnt += delta; write_c0_compare(cnt); @@ -31,7 +31,7 @@ res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0; return res; } -@@ -99,22 +116,6 @@ +@@ -99,22 +116,6 @@ static int c0_compare_int_pending(void) return (read_c0_cause() >> cp0_compare_irq) & 0x100; } -- cgit v1.2.3