From 0f80ce2088410d9ccb5f3c8070210af67c787ae0 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 6 Nov 2008 20:55:33 +0000
Subject: [kernel] refresh 2.6.26 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13135 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch       |  6 +++---
 target/linux/ar71xx/patches-2.6.26/002-ar71xx_pci.patch        |  2 +-
 target/linux/ar71xx/patches-2.6.26/003-ar71xx_usb_host.patch   | 10 +++++-----
 .../ar71xx/patches-2.6.26/004-ar71xx_spi_controller.patch      |  4 ++--
 target/linux/ar71xx/patches-2.6.26/005-ar71xx_mac_driver.patch |  2 +-
 target/linux/ar71xx/patches-2.6.26/006-ar71xx_wdt_driver.patch |  4 ++--
 .../ar71xx/patches-2.6.26/100-mtd_pm25lv_flash_support.patch   |  2 +-
 .../linux/ar71xx/patches-2.6.26/101-ksz8041_phy_driver.patch   |  4 ++--
 .../ar71xx/patches-2.6.26/140-redboot_partition_scan.patch     |  4 ++--
 target/linux/ar71xx/patches-2.6.26/200-rb4xx_nand_driver.patch |  4 ++--
 target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch  |  4 ++--
 .../ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch |  4 ++--
 .../patches-2.6.26/901-get_c0_compare_irq_function.patch       |  4 ++--
 .../ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch  |  8 ++++----
 14 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'target/linux/ar71xx')

diff --git a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
index ebf8d6039..3702b652c 100644
--- a/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.26/001-ar71xx_core.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -597,6 +597,13 @@
+@@ -597,6 +597,13 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  
@@ -35,7 +35,7 @@
  #define  MACH_NEC_MARKEINS	0	/* NEC EMMA2RH Mark-eins	*/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -21,6 +21,24 @@
+@@ -21,6 +21,24 @@ choice
  config MACH_ALCHEMY
  	bool "Alchemy processor based machines"
  
@@ -60,7 +60,7 @@
  config BASLER_EXCITE
  	bool "Basler eXcite smart camera"
  	select CEVT_R4K
-@@ -687,6 +705,7 @@
+@@ -687,6 +705,7 @@ config WR_PPMC
  
  endchoice
  
diff --git a/target/linux/ar71xx/patches-2.6.26/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.26/002-ar71xx_pci.patch
index 8ae604a24..85e22f8c7 100644
--- a/target/linux/ar71xx/patches-2.6.26/002-ar71xx_pci.patch
+++ b/target/linux/ar71xx/patches-2.6.26/002-ar71xx_pci.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/pci/Makefile
 +++ b/arch/mips/pci/Makefile
-@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@ obj-$(CONFIG_MIPS_TX3927)	+= ops-tx3927.
  obj-$(CONFIG_PCI_VR41XX)	+= ops-vr41xx.o pci-vr41xx.o
  obj-$(CONFIG_NEC_CMBVR4133)	+= fixup-vr4133.o
  obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
diff --git a/target/linux/ar71xx/patches-2.6.26/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.26/003-ar71xx_usb_host.patch
index 99b283f8f..38c0e8569 100644
--- a/target/linux/ar71xx/patches-2.6.26/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.26/003-ar71xx_usb_host.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig
-@@ -81,6 +81,12 @@
+@@ -81,6 +81,12 @@ config USB_EHCI_BIG_ENDIAN_DESC
  	depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
  	default y
  
@@ -13,7 +13,7 @@
  config USB_EHCI_FSL
  	bool "Support for Freescale on-chip EHCI USB controller"
  	depends on USB_EHCI_HCD && FSL_SOC
-@@ -152,6 +158,12 @@
+@@ -152,6 +158,12 @@ config USB_OHCI_HCD
  	  To compile this driver as a module, choose M here: the
  	  module will be called ohci-hcd.
  
@@ -28,7 +28,7 @@
  	depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1034,6 +1034,11 @@
+@@ -1034,6 +1034,11 @@ MODULE_LICENSE ("GPL");
  #define	PLATFORM_DRIVER		ixp4xx_ehci_driver
  #endif
  
@@ -42,7 +42,7 @@
  #error "missing bus glue for ehci-hcd"
 --- a/drivers/usb/host/ohci.h
 +++ b/drivers/usb/host/ohci.h
-@@ -538,6 +538,11 @@
+@@ -538,6 +538,11 @@ static inline struct usb_hcd *ohci_to_hc
  #define writel_be(val, addr)	out_be32((__force unsigned *)addr, val)
  #endif
  
@@ -56,7 +56,7 @@
  {
 --- a/drivers/usb/host/ohci-hcd.c
 +++ b/drivers/usb/host/ohci-hcd.c
-@@ -1057,6 +1057,11 @@
+@@ -1057,6 +1057,11 @@ MODULE_LICENSE ("GPL");
  #define SM501_OHCI_DRIVER	ohci_hcd_sm501_driver
  #endif
  
diff --git a/target/linux/ar71xx/patches-2.6.26/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.26/004-ar71xx_spi_controller.patch
index b2d11ff08..e0bd2c7aa 100644
--- a/target/linux/ar71xx/patches-2.6.26/004-ar71xx_spi_controller.patch
+++ b/target/linux/ar71xx/patches-2.6.26/004-ar71xx_spi_controller.patch
@@ -1,6 +1,6 @@
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -52,6 +52,13 @@
+@@ -52,6 +52,13 @@ config SPI_MASTER
  comment "SPI Master Controller Drivers"
  	depends on SPI_MASTER
  
@@ -16,7 +16,7 @@
  	depends on (ARCH_AT91 || AVR32) && SPI_MASTER
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
-@@ -11,6 +11,7 @@
+@@ -11,6 +11,7 @@ endif
  obj-$(CONFIG_SPI_MASTER)		+= spi.o
  
  # SPI master controller drivers (bus)
diff --git a/target/linux/ar71xx/patches-2.6.26/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.26/005-ar71xx_mac_driver.patch
index 2858666b1..e638157a0 100644
--- a/target/linux/ar71xx/patches-2.6.26/005-ar71xx_mac_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.26/005-ar71xx_mac_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2060,6 +2060,8 @@
+@@ -2060,6 +2060,8 @@ config ACENIC_OMIT_TIGON_I
  
  	  The safe and default value for this is N.
  
diff --git a/target/linux/ar71xx/patches-2.6.26/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.26/006-ar71xx_wdt_driver.patch
index 219dfc0a8..fde70f35f 100644
--- a/target/linux/ar71xx/patches-2.6.26/006-ar71xx_wdt_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.26/006-ar71xx_wdt_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -683,6 +683,13 @@
+@@ -683,6 +683,13 @@ config TXX9_WDT
  	help
  	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
  
@@ -16,7 +16,7 @@
  # POWERPC Architecture
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
-@@ -97,6 +97,7 @@
+@@ -97,6 +97,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/ar71xx/patches-2.6.26/100-mtd_pm25lv_flash_support.patch b/target/linux/ar71xx/patches-2.6.26/100-mtd_pm25lv_flash_support.patch
index 8bfe9dd43..c20bd940f 100644
--- a/target/linux/ar71xx/patches-2.6.26/100-mtd_pm25lv_flash_support.patch
+++ b/target/linux/ar71xx/patches-2.6.26/100-mtd_pm25lv_flash_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -455,6 +455,10 @@
+@@ -455,6 +455,10 @@ static struct flash_info __devinitdata m
  	{ "at26df161a", 0x1f4601, 64 * 1024, 32, SECT_4K, },
  	{ "at26df321",  0x1f4701, 64 * 1024, 64, SECT_4K, },
  
diff --git a/target/linux/ar71xx/patches-2.6.26/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.26/101-ksz8041_phy_driver.patch
index 9b69eca7c..7b9c2ec47 100644
--- a/target/linux/ar71xx/patches-2.6.26/101-ksz8041_phy_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.26/101-ksz8041_phy_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -76,6 +76,11 @@
+@@ -82,6 +82,11 @@ config MVSWITCH_PHY
  	---help---
  	  Currently supports the Marvell 88E6060 switch.
  
@@ -14,7 +14,7 @@
  	depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -15,5 +15,6 @@
+@@ -16,5 +16,6 @@ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
  obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
diff --git a/target/linux/ar71xx/patches-2.6.26/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.26/140-redboot_partition_scan.patch
index 3e89407d0..c46a56a50 100644
--- a/target/linux/ar71xx/patches-2.6.26/140-redboot_partition_scan.patch
+++ b/target/linux/ar71xx/patches-2.6.26/140-redboot_partition_scan.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c
-@@ -62,31 +62,32 @@
+@@ -62,31 +62,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);
  
-@@ -158,6 +159,11 @@
+@@ -158,6 +159,11 @@ static int parse_redboot_partitions(stru
  	}
  	if (i == numslots) {
  		/* Didn't find it */
diff --git a/target/linux/ar71xx/patches-2.6.26/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.26/200-rb4xx_nand_driver.patch
index c8be04bfe..a0d55d666 100644
--- a/target/linux/ar71xx/patches-2.6.26/200-rb4xx_nand_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.26/200-rb4xx_nand_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/nand/Kconfig
 +++ b/drivers/mtd/nand/Kconfig
-@@ -386,4 +386,8 @@
+@@ -386,4 +386,8 @@ config MTD_NAND_FSL_UPM
  	  Enables support for NAND Flash chips wired onto Freescale PowerPC
  	  processor localbus with User-Programmable Machine support.
  
@@ -11,7 +11,7 @@
  endif # MTD_NAND
 --- a/drivers/mtd/nand/Makefile
 +++ b/drivers/mtd/nand/Makefile
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx27
  obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)	+= excite_nandflash.o
  obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
  obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
index e8af1eeb8..21266f89a 100644
--- a/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
+++ b/target/linux/ar71xx/patches-2.6.26/300-mips_fw_myloader.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -158,6 +158,7 @@
+@@ -158,6 +158,7 @@ endif
  #
  libs-$(CONFIG_ARC)		+= arch/mips/fw/arc/
  libs-$(CONFIG_CFE)		+= arch/mips/fw/cfe/
@@ -10,7 +10,7 @@
  libs-$(CONFIG_SIBYTE_CFE)	+= arch/mips/sibyte/cfe/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -874,6 +874,9 @@
+@@ -874,6 +874,9 @@ config MIPS_NILE4
  config MIPS_DISABLE_OBSOLETE_IDE
  	bool
  
diff --git a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
index 755b920e4..abcdfb581 100644
--- a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
+++ b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
@@ -113,7 +113,7 @@
 +
 --- a/arch/mips/kernel/Makefile
 +++ b/arch/mips/kernel/Makefile
-@@ -86,6 +86,7 @@
+@@ -86,6 +86,7 @@ obj-$(CONFIG_GPIO_TXX9)		+= gpio_txx9.o
  
  obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
@@ -123,7 +123,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -880,6 +880,9 @@
+@@ -880,6 +880,9 @@ config MYLOADER
  config SYNC_R4K
  	bool
  
diff --git a/target/linux/ar71xx/patches-2.6.26/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.26/901-get_c0_compare_irq_function.patch
index 292025807..3eaeb8bd3 100644
--- a/target/linux/ar71xx/patches-2.6.26/901-get_c0_compare_irq_function.patch
+++ b/target/linux/ar71xx/patches-2.6.26/901-get_c0_compare_irq_function.patch
@@ -8,7 +8,7 @@
  
  extern asmlinkage void handle_int(void);
  extern asmlinkage void handle_tlbm(void);
-@@ -1464,6 +1465,8 @@
+@@ -1464,6 +1465,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);
diff --git a/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch b/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch
index bdf0d0fb6..61d9610cf 100644
--- a/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch
+++ b/target/linux/ar71xx/patches-2.6.26/902-mips_clocksource_init_war.patch
@@ -23,7 +23,7 @@
  static int mips_next_event(unsigned long delta,
                             struct clock_event_device *evt)
  {
-@@ -28,6 +44,7 @@
+@@ -28,6 +44,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;
  #ifdef CONFIG_MIPS_MT_SMTC
  	evpe(vpflags);
-@@ -187,7 +204,7 @@
+@@ -187,7 +204,7 @@ static int c0_compare_int_usable(void)
  	 */
  	if (c0_compare_int_pending()) {
  		write_c0_compare(read_c0_count());
@@ -40,7 +40,7 @@
  		if (c0_compare_int_pending())
  			return 0;
  	}
-@@ -196,7 +213,7 @@
+@@ -196,7 +213,7 @@ static int c0_compare_int_usable(void)
  		cnt = read_c0_count();
  		cnt += delta;
  		write_c0_compare(cnt);
@@ -49,7 +49,7 @@
  		if ((int)(read_c0_count() - cnt) < 0)
  		    break;
  		/* increase delta if the timer was already expired */
-@@ -205,11 +222,12 @@
+@@ -205,11 +222,12 @@ static int c0_compare_int_usable(void)
  	while ((int)(read_c0_count() - cnt) <= 0)
  		;	/* Wait for expiry  */
  
-- 
cgit v1.2.3