refresh patches

SVN-Revision: 10644

diff --git a/target/linux/adm5120/patches/001-adm5120.patch b/target/linux/adm5120/patches/001-adm5120.patch
index 1deda1a083bf27e38ba86976c743bd8ce9281518..78b9b68709ba288f7d14debeaa8ac7e8adc98f17 100644 (file)
--- a/target/linux/adm5120/patches/001-adm5120.patch
+++ b/target/linux/adm5120/patches/001-adm5120.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/arch/mips/Kconfig
+Index: linux-2.6.24.2/arch/mips/Kconfig
 ===================================================================
---- linux-2.6.24.orig/arch/mips/Kconfig
-+++ linux-2.6.24/arch/mips/Kconfig
+--- linux-2.6.24.2.orig/arch/mips/Kconfig
++++ linux-2.6.24.2/arch/mips/Kconfig
 @@ -16,6 +16,20 @@ choice
        prompt "System type"
        default SGI_IP22
@@ -31,10 +31,10 @@ Index: linux-2.6.24/arch/mips/Kconfig
  source "arch/mips/au1000/Kconfig"
  source "arch/mips/jazz/Kconfig"
  source "arch/mips/lasat/Kconfig"
-Index: linux-2.6.24/arch/mips/Makefile
+Index: linux-2.6.24.2/arch/mips/Makefile
 ===================================================================
---- linux-2.6.24.orig/arch/mips/Makefile
-+++ linux-2.6.24/arch/mips/Makefile
+--- linux-2.6.24.2.orig/arch/mips/Makefile
++++ linux-2.6.24.2/arch/mips/Makefile
 @@ -166,6 +166,16 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
  
@@ -52,10 +52,10 @@ Index: linux-2.6.24/arch/mips/Makefile
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
-Index: linux-2.6.24/include/asm-mips/bootinfo.h
+Index: linux-2.6.24.2/include/asm-mips/bootinfo.h
 ===================================================================
---- linux-2.6.24.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.24/include/asm-mips/bootinfo.h
+--- linux-2.6.24.2.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.24.2/include/asm-mips/bootinfo.h
 @@ -198,6 +198,58 @@
  #define MACH_GROUP_BRCM               23      /* Broadcom                     */
  #define  MACH_BCM47XX         1       /* Broadcom BCM47XX             */

diff --git a/target/linux/adm5120/patches/002-adm5120_flash.patch b/target/linux/adm5120/patches/002-adm5120_flash.patch
index a1eea9f0da54ea0684821893d5681a4cf8cd7434..ad783ca5e2c49919e17de65264385a4a579fc9ac 100644 (file)
--- a/target/linux/adm5120/patches/002-adm5120_flash.patch
+++ b/target/linux/adm5120/patches/002-adm5120_flash.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/mtd/maps/Kconfig
+Index: linux-2.6.24.2/drivers/mtd/maps/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.24/drivers/mtd/maps/Kconfig
+--- linux-2.6.24.2.orig/drivers/mtd/maps/Kconfig
++++ linux-2.6.24.2/drivers/mtd/maps/Kconfig
 @@ -597,5 +597,9 @@ config MTD_PLATRAM
  
          This selection automatically selects the map_ram driver.
@@ -12,10 +12,10 @@ Index: linux-2.6.24/drivers/mtd/maps/Kconfig
 +
  endmenu
  
-Index: linux-2.6.24/drivers/mtd/maps/Makefile
+Index: linux-2.6.24.2/drivers/mtd/maps/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.24/drivers/mtd/maps/Makefile
+--- linux-2.6.24.2.orig/drivers/mtd/maps/Makefile
++++ linux-2.6.24.2/drivers/mtd/maps/Makefile
 @@ -45,6 +45,7 @@ obj-$(CONFIG_MTD_DBOX2)              += dbox2-flash.
  obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
  obj-$(CONFIG_MTD_PCI)         += pci.o

diff --git a/target/linux/adm5120/patches/003-adm5120_switch.patch b/target/linux/adm5120/patches/003-adm5120_switch.patch
index 6a14c2b376a037deb1dce1247e9f0771164074ce..409809d5b9105f73b779257c0d54c5cdc708d286 100644 (file)
--- a/target/linux/adm5120/patches/003-adm5120_switch.patch
+++ b/target/linux/adm5120/patches/003-adm5120_switch.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/net/Kconfig
+Index: linux-2.6.24.2/drivers/net/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/net/Kconfig
-+++ linux-2.6.24/drivers/net/Kconfig
+--- linux-2.6.24.2.orig/drivers/net/Kconfig
++++ linux-2.6.24.2/drivers/net/Kconfig
 @@ -601,6 +601,10 @@ config MIPS_AU1X00_ENET
          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
@@ -13,10 +13,10 @@ Index: linux-2.6.24/drivers/net/Kconfig
  config SGI_IOC3_ETH
        bool "SGI IOC3 Ethernet"
        depends on PCI && SGI_IP27
-Index: linux-2.6.24/drivers/net/Makefile
+Index: linux-2.6.24.2/drivers/net/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/net/Makefile
-+++ linux-2.6.24/drivers/net/Makefile
+--- linux-2.6.24.2.orig/drivers/net/Makefile
++++ linux-2.6.24.2/drivers/net/Makefile
 @@ -183,6 +183,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
  # This is also a 82596 and should probably be merged
  obj-$(CONFIG_LP486E) += lp486e.o

diff --git a/target/linux/adm5120/patches/005-adm5120_usb.patch b/target/linux/adm5120/patches/005-adm5120_usb.patch
index a2e43b4f6658ec97062fdfc886c3eeed17a383b2..dc8ec9224f5713fb49f5acbe10b51939b49134b3 100644 (file)
--- a/target/linux/adm5120/patches/005-adm5120_usb.patch
+++ b/target/linux/adm5120/patches/005-adm5120_usb.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/usb/host/Kconfig
+Index: linux-2.6.24.2/drivers/usb/host/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/usb/host/Kconfig
-+++ linux-2.6.24/drivers/usb/host/Kconfig
+--- linux-2.6.24.2.orig/drivers/usb/host/Kconfig
++++ linux-2.6.24.2/drivers/usb/host/Kconfig
 @@ -261,3 +261,6 @@ config USB_R8A66597_HCD
          To compile this driver as a module, choose M here: the
          module will be called r8a66597-hcd.
@@ -9,10 +9,10 @@ Index: linux-2.6.24/drivers/usb/host/Kconfig
 +config USB_ADM5120_HCD
 +      tristate "ADM5120 HCD support (EXPERIMENTAL)"
 +      depends on USB && MIPS_ADM5120 && EXPERIMENTAL
-Index: linux-2.6.24/drivers/usb/host/Makefile
+Index: linux-2.6.24.2/drivers/usb/host/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/usb/host/Makefile
-+++ linux-2.6.24/drivers/usb/host/Makefile
+--- linux-2.6.24.2.orig/drivers/usb/host/Makefile
++++ linux-2.6.24.2/drivers/usb/host/Makefile
 @@ -8,6 +8,7 @@ endif
  
  obj-$(CONFIG_PCI)             += pci-quirks.o
@@ -21,10 +21,10 @@ Index: linux-2.6.24/drivers/usb/host/Makefile
  obj-$(CONFIG_USB_EHCI_HCD)    += ehci-hcd.o
  obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
  obj-$(CONFIG_USB_OHCI_HCD)    += ohci-hcd.o
-Index: linux-2.6.24/drivers/usb/Makefile
+Index: linux-2.6.24.2/drivers/usb/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/usb/Makefile
-+++ linux-2.6.24/drivers/usb/Makefile
+--- linux-2.6.24.2.orig/drivers/usb/Makefile
++++ linux-2.6.24.2/drivers/usb/Makefile
 @@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD)   += host/
  obj-$(CONFIG_USB_SL811_HCD)   += host/
  obj-$(CONFIG_USB_U132_HCD)    += host/

diff --git a/target/linux/adm5120/patches/006-adm5120_leds.patch b/target/linux/adm5120/patches/006-adm5120_leds.patch
index a055b3560fccf2be6cd2b76735f53f0752b6326b..eadccb6ded480ba7ee77dec88dcb9ea21f139d05 100644 (file)
--- a/target/linux/adm5120/patches/006-adm5120_leds.patch
+++ b/target/linux/adm5120/patches/006-adm5120_leds.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/leds/Kconfig
+Index: linux-2.6.24.2/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/leds/Kconfig
-+++ linux-2.6.24/drivers/leds/Kconfig
+--- linux-2.6.24.2.orig/drivers/leds/Kconfig
++++ linux-2.6.24.2/drivers/leds/Kconfig
 @@ -18,6 +18,21 @@ config LEDS_CLASS
  
  comment "LED drivers"
@@ -24,10 +24,10 @@ Index: linux-2.6.24/drivers/leds/Kconfig
  config LEDS_CORGI
        tristate "LED Support for the Sharp SL-C7x0 series"
        depends on LEDS_CLASS && PXA_SHARP_C7xx
-Index: linux-2.6.24/drivers/leds/Makefile
+Index: linux-2.6.24.2/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/leds/Makefile
-+++ linux-2.6.24/drivers/leds/Makefile
+--- linux-2.6.24.2.orig/drivers/leds/Makefile
++++ linux-2.6.24.2/drivers/leds/Makefile
 @@ -5,6 +5,7 @@ obj-$(CONFIG_LEDS_CLASS)               += led-class.o
  obj-$(CONFIG_LEDS_TRIGGERS)           += led-triggers.o
  

diff --git a/target/linux/adm5120/patches/007-adm5120_pci.patch b/target/linux/adm5120/patches/007-adm5120_pci.patch
index bce0c814b94a988d6a00ef36c22332b034ba88a7..103a62a2d4197f44ff9b25b53ec379b0395a4cc6 100644 (file)
--- a/target/linux/adm5120/patches/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches/007-adm5120_pci.patch
@@ -1,16 +1,16 @@
-Index: linux-2.6.24/arch/mips/pci/Makefile
+Index: linux-2.6.24.2/arch/mips/pci/Makefile
 ===================================================================
---- linux-2.6.24.orig/arch/mips/pci/Makefile
-+++ linux-2.6.24/arch/mips/pci/Makefile
+--- linux-2.6.24.2.orig/arch/mips/pci/Makefile
++++ linux-2.6.24.2/arch/mips/pci/Makefile
 @@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)       += fixup-
  obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
 +obj-$(CONFIG_PCI_ADM5120)     += pci-adm5120.o
-Index: linux-2.6.24/include/linux/pci_ids.h
+Index: linux-2.6.24.2/include/linux/pci_ids.h
 ===================================================================
---- linux-2.6.24.orig/include/linux/pci_ids.h
-+++ linux-2.6.24/include/linux/pci_ids.h
+--- linux-2.6.24.2.orig/include/linux/pci_ids.h
++++ linux-2.6.24.2/include/linux/pci_ids.h
 @@ -1703,6 +1703,9 @@
  #define PCI_VENDOR_ID_ESDGMBH         0x12fe
  #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111

diff --git a/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch
index 60b78ebf73b0570fc716c77bdb1566de8668b8da..fbd0626e69fcbc0c99fa34b3c96a46b7ba9844c4 100644 (file)
--- a/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch
+++ b/target/linux/adm5120/patches/009-adm5120_leds_switch_trigger.patch
@@ -1,10 +1,10 @@
-Index: linux-2.6.24/drivers/leds/Kconfig
+Index: linux-2.6.24.2/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/leds/Kconfig
-+++ linux-2.6.24/drivers/leds/Kconfig
-@@ -171,4 +171,12 @@ config LEDS_TRIGGER_MORSE
-       tristate "LED Morse Trigger"
-       depends on LEDS_TRIGGERS
+--- linux-2.6.24.2.orig/drivers/leds/Kconfig
++++ linux-2.6.24.2/drivers/leds/Kconfig
+@@ -178,4 +178,12 @@ config LEDS_TRIGGER_DEFAULT_ON
+         This allows LEDs to be initialised in the ON state.
+         If unsure, say Y.
  
 +config LEDS_TRIGGER_ADM5120_SWITCH
 +      tristate "LED ADM5120 Switch Port Status Trigger"
@@ -15,12 +15,12 @@ Index: linux-2.6.24/drivers/leds/Kconfig
 +        If unsure, say N.
 +
  endif # NEW_LEDS
-Index: linux-2.6.24/drivers/leds/Makefile
+Index: linux-2.6.24.2/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/leds/Makefile
-+++ linux-2.6.24/drivers/leds/Makefile
-@@ -27,3 +27,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)     += ledt
- obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
+--- linux-2.6.24.2.orig/drivers/leds/Makefile
++++ linux-2.6.24.2/drivers/leds/Makefile
+@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)  += l
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
+ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
 +obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o

diff --git a/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch b/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch
index 519b1c2392759dedadd2410a911e7bd569db56f9..8015f32b12835f58bec1c957fd05973ce89a0f1a 100644 (file)
--- a/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch
+++ b/target/linux/adm5120/patches/100-mtd_myloder_partition_parser.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/mtd/Kconfig
+Index: linux-2.6.24.2/drivers/mtd/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/Kconfig
-+++ linux-2.6.24/drivers/mtd/Kconfig
+--- linux-2.6.24.2.orig/drivers/mtd/Kconfig
++++ linux-2.6.24.2/drivers/mtd/Kconfig
 @@ -160,6 +160,22 @@ config MTD_AFS_PARTS
          for your particular device. It won't happen automatically. The
          'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
@@ -25,10 +25,10 @@ Index: linux-2.6.24/drivers/mtd/Kconfig
  comment "User Modules And Translation Layers"
  
  config MTD_CHAR
-Index: linux-2.6.24/drivers/mtd/Makefile
+Index: linux-2.6.24.2/drivers/mtd/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/Makefile
-+++ linux-2.6.24/drivers/mtd/Makefile
+--- linux-2.6.24.2.orig/drivers/mtd/Makefile
++++ linux-2.6.24.2/drivers/mtd/Makefile
 @@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
  obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
  obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o

diff --git a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch
index 19c87a90bfe1ac8b3664cfd3be02115d2f4a9046..2a7e63a01291ae2cdb398b2710bbdf6f53cd46b1 100644 (file)
--- a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c
+Index: linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0002.c
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.24.2.orig/drivers/mtd/chips/cfi_cmdset_0002.c
++++ linux-2.6.24.2/drivers/mtd/chips/cfi_cmdset_0002.c
 @@ -47,12 +47,19 @@
  #define MANUFACTURER_AMD      0x0001
  #define MANUFACTURER_ATMEL    0x001F
@@ -74,10 +74,10 @@ Index: linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c
        { 0, 0, NULL, NULL }
  };
  static struct cfi_fixup jedec_fixup_table[] = {
-Index: linux-2.6.24/drivers/mtd/chips/Kconfig
+Index: linux-2.6.24.2/drivers/mtd/chips/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/chips/Kconfig
-+++ linux-2.6.24/drivers/mtd/chips/Kconfig
+--- linux-2.6.24.2.orig/drivers/mtd/chips/Kconfig
++++ linux-2.6.24.2/drivers/mtd/chips/Kconfig
 @@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.

diff --git a/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch
index 772c92f79fd6e7a1a8423939efaf0b28a81e2805..edab0e7469e31074a6b70d32783cf950e740e01f 100644 (file)
--- a/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch
+++ b/target/linux/adm5120/patches/102-jedec_pmc_39lvxxx_chips.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/mtd/chips/jedec_probe.c
+Index: linux-2.6.24.2/drivers/mtd/chips/jedec_probe.c
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/chips/jedec_probe.c
-+++ linux-2.6.24/drivers/mtd/chips/jedec_probe.c
+--- linux-2.6.24.2.orig/drivers/mtd/chips/jedec_probe.c
++++ linux-2.6.24.2/drivers/mtd/chips/jedec_probe.c
 @@ -121,6 +121,10 @@
  #define UPD29F064115  0x221C
  

diff --git a/target/linux/adm5120/patches/103-mtd_trxsplit.patch b/target/linux/adm5120/patches/103-mtd_trxsplit.patch
index c709123428a26cb203c6e0288e7bb4f4a63b055c..1430700ea67e9805c2bebeb988ebb265c1a91498 100644 (file)
--- a/target/linux/adm5120/patches/103-mtd_trxsplit.patch
+++ b/target/linux/adm5120/patches/103-mtd_trxsplit.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/mtd/Kconfig
+Index: linux-2.6.24.2/drivers/mtd/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/Kconfig
-+++ linux-2.6.24/drivers/mtd/Kconfig
+--- linux-2.6.24.2.orig/drivers/mtd/Kconfig
++++ linux-2.6.24.2/drivers/mtd/Kconfig
 @@ -57,6 +57,11 @@ config MTD_ROOTFS_SPLIT
        depends on MTD_PARTITIONS
        default y
@@ -14,10 +14,10 @@ Index: linux-2.6.24/drivers/mtd/Kconfig
  config MTD_REDBOOT_PARTS
        tristate "RedBoot partition table parsing"
        depends on MTD_PARTITIONS
-Index: linux-2.6.24/drivers/mtd/Makefile
+Index: linux-2.6.24.2/drivers/mtd/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/mtd/Makefile
-+++ linux-2.6.24/drivers/mtd/Makefile
+--- linux-2.6.24.2.orig/drivers/mtd/Makefile
++++ linux-2.6.24.2/drivers/mtd/Makefile
 @@ -8,6 +8,7 @@ mtd-y                          := mtdcore.o mtdsuper.o
  mtd-$(CONFIG_MTD_PARTITIONS)  += mtdpart.o
  

diff --git a/target/linux/adm5120/patches/120-rb153_cf_driver.patch b/target/linux/adm5120/patches/120-rb153_cf_driver.patch
index e382871871c1d3a8bea2779d4453c55599aef645..c89d64c13cc568f8b4b533a16b505902ca65c868 100644 (file)
--- a/target/linux/adm5120/patches/120-rb153_cf_driver.patch
+++ b/target/linux/adm5120/patches/120-rb153_cf_driver.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/ata/Makefile
+Index: linux-2.6.24.2/drivers/ata/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/ata/Makefile
-+++ linux-2.6.24/drivers/ata/Makefile
+--- linux-2.6.24.2.orig/drivers/ata/Makefile
++++ linux-2.6.24.2/drivers/ata/Makefile
 @@ -69,6 +69,7 @@ obj-$(CONFIG_PATA_BF54X)     += pata_bf54x.o
  obj-$(CONFIG_PATA_PLATFORM)   += pata_platform.o
  obj-$(CONFIG_PATA_OF_PLATFORM)        += pata_of_platform.o
@@ -10,10 +10,10 @@ Index: linux-2.6.24/drivers/ata/Makefile
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o
  # Should be last but one libata driver
-Index: linux-2.6.24/drivers/ata/Kconfig
+Index: linux-2.6.24.2/drivers/ata/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/ata/Kconfig
-+++ linux-2.6.24/drivers/ata/Kconfig
+--- linux-2.6.24.2.orig/drivers/ata/Kconfig
++++ linux-2.6.24.2/drivers/ata/Kconfig
 @@ -660,4 +660,13 @@ config PATA_BF54X
  
          If unsure, say N.

diff --git a/target/linux/adm5120/patches/140-cmdline_hack.patch b/target/linux/adm5120/patches/140-cmdline_hack.patch
index 58a63ba2a9d9b486b1e8bf9b8e9910ebd34fa753..6c046b5a910482b67100a193a363e5ef694e995a 100644 (file)
--- a/target/linux/adm5120/patches/140-cmdline_hack.patch
+++ b/target/linux/adm5120/patches/140-cmdline_hack.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/arch/mips/kernel/head.S
+Index: linux-2.6.24.2/arch/mips/kernel/head.S
 ===================================================================
---- linux-2.6.24.orig/arch/mips/kernel/head.S
-+++ linux-2.6.24/arch/mips/kernel/head.S
+--- linux-2.6.24.2.orig/arch/mips/kernel/head.S
++++ linux-2.6.24.2/arch/mips/kernel/head.S
 @@ -126,7 +126,12 @@
        /*
         * Reserved space for exception handlers.

diff --git a/target/linux/adm5120/patches/200-amba_pl010_hacks.patch b/target/linux/adm5120/patches/200-amba_pl010_hacks.patch
index 22f5083465a7ea1cb2bf3e3609ef658304234ad8..97b1b40ece940bcf07732ca074895999bb2b9b89 100644 (file)
--- a/target/linux/adm5120/patches/200-amba_pl010_hacks.patch
+++ b/target/linux/adm5120/patches/200-amba_pl010_hacks.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/serial/amba-pl010.c
+Index: linux-2.6.24.2/drivers/serial/amba-pl010.c
 ===================================================================
---- linux-2.6.24.orig/drivers/serial/amba-pl010.c
-+++ linux-2.6.24/drivers/serial/amba-pl010.c
+--- linux-2.6.24.2.orig/drivers/serial/amba-pl010.c
++++ linux-2.6.24.2/drivers/serial/amba-pl010.c
 @@ -52,11 +52,10 @@
  
  #include <asm/io.h>
@@ -264,11 +264,11 @@ Index: linux-2.6.24/drivers/serial/amba-pl010.c
        .cons                   = AMBA_CONSOLE,
  };
  
-Index: linux-2.6.24/drivers/serial/Kconfig
+Index: linux-2.6.24.2/drivers/serial/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/serial/Kconfig
-+++ linux-2.6.24/drivers/serial/Kconfig
-@@ -303,10 +303,25 @@ config SERIAL_AMBA_PL010
+--- linux-2.6.24.2.orig/drivers/serial/Kconfig
++++ linux-2.6.24.2/drivers/serial/Kconfig
+@@ -287,10 +287,25 @@ config SERIAL_AMBA_PL010
        help
          This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
          an Integrator/AP or Integrator/PP2 platform, or if you have a

diff --git a/target/linux/adm5120/patches/201-amba_bus_hacks.patch b/target/linux/adm5120/patches/201-amba_bus_hacks.patch
index 0f1c3b2e3886ce4d7caa3dd9328f6aed2d81c91c..ab2474353afc2cd81e73a255d92ee5fe0b024354 100644 (file)
--- a/target/linux/adm5120/patches/201-amba_bus_hacks.patch
+++ b/target/linux/adm5120/patches/201-amba_bus_hacks.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/amba/bus.c
+Index: linux-2.6.24.2/drivers/amba/bus.c
 ===================================================================
---- linux-2.6.24.orig/drivers/amba/bus.c
-+++ linux-2.6.24/drivers/amba/bus.c
+--- linux-2.6.24.2.orig/drivers/amba/bus.c
++++ linux-2.6.24.2/drivers/amba/bus.c
 @@ -17,6 +17,10 @@
  #include <asm/io.h>
  #include <asm/sizes.h>

diff --git a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch
index 2aa86e2b13875c77ca7236550ee0f0b14f298764..49ee1ce763e83ee70df75e461054e01b9103c738 100644 (file)
--- a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch
+++ b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/pci/Kconfig
+Index: linux-2.6.24.2/drivers/pci/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/pci/Kconfig
-+++ linux-2.6.24/drivers/pci/Kconfig
+--- linux-2.6.24.2.orig/drivers/pci/Kconfig
++++ linux-2.6.24.2/drivers/pci/Kconfig
 @@ -42,6 +42,12 @@ config PCI_DEBUG
  
          When in doubt, say N.
@@ -15,10 +15,10 @@ Index: linux-2.6.24/drivers/pci/Kconfig
  config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y
-Index: linux-2.6.24/drivers/pci/quirks.c
+Index: linux-2.6.24.2/drivers/pci/quirks.c
 ===================================================================
---- linux-2.6.24.orig/drivers/pci/quirks.c
-+++ linux-2.6.24/drivers/pci/quirks.c
+--- linux-2.6.24.2.orig/drivers/pci/quirks.c
++++ linux-2.6.24.2/drivers/pci/quirks.c
 @@ -23,6 +23,7 @@
  #include <linux/acpi.h>
  #include "pci.h"

diff --git a/target/linux/adm5120/patches/203-gpio_leds_brightness.patch b/target/linux/adm5120/patches/203-gpio_leds_brightness.patch
index 37eb0ab5fa7c004f714e64932769a19c4cec7269..1a21c217f3b92da04699f2d32624fa1cb0518863 100644 (file)
--- a/target/linux/adm5120/patches/203-gpio_leds_brightness.patch
+++ b/target/linux/adm5120/patches/203-gpio_leds_brightness.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/leds/leds-gpio.c
+Index: linux-2.6.24.2/drivers/leds/leds-gpio.c
 ===================================================================
---- linux-2.6.24.orig/drivers/leds/leds-gpio.c
-+++ linux-2.6.24/drivers/leds/leds-gpio.c
+--- linux-2.6.24.2.orig/drivers/leds/leds-gpio.c
++++ linux-2.6.24.2/drivers/leds/leds-gpio.c
 @@ -41,13 +41,17 @@ static void gpio_led_set(struct led_clas
                container_of(led_cdev, struct gpio_led_data, cdev);
        int level;

diff --git a/target/linux/adm5120/patches/300-i2c_gpio_custom.patch b/target/linux/adm5120/patches/300-i2c_gpio_custom.patch
index d0736f36163b9f99324df4d0ee2cd9227cde9201..f7f8997d683a17837e25e18f07fc7dfd14c5403a 100644 (file)
--- a/target/linux/adm5120/patches/300-i2c_gpio_custom.patch
+++ b/target/linux/adm5120/patches/300-i2c_gpio_custom.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/i2c/busses/Kconfig
+Index: linux-2.6.24.2/drivers/i2c/busses/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/i2c/busses/Kconfig
-+++ linux-2.6.24/drivers/i2c/busses/Kconfig
+--- linux-2.6.24.2.orig/drivers/i2c/busses/Kconfig
++++ linux-2.6.24.2/drivers/i2c/busses/Kconfig
 @@ -146,6 +146,17 @@ config I2C_GPIO
          This is a very simple bitbanging I2C driver utilizing the
          arch-neutral GPIO API to control the SCL and SDA lines.
@@ -20,10 +20,10 @@ Index: linux-2.6.24/drivers/i2c/busses/Kconfig
  config I2C_HYDRA
        tristate "CHRP Apple Hydra Mac I/O I2C interface"
        depends on PCI && PPC_CHRP && EXPERIMENTAL
-Index: linux-2.6.24/drivers/i2c/busses/Makefile
+Index: linux-2.6.24.2/drivers/i2c/busses/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/i2c/busses/Makefile
-+++ linux-2.6.24/drivers/i2c/busses/Makefile
+--- linux-2.6.24.2.orig/drivers/i2c/busses/Makefile
++++ linux-2.6.24.2/drivers/i2c/busses/Makefile
 @@ -14,6 +14,7 @@ obj-$(CONFIG_I2C_BLACKFIN_TWI)       += i2c-bf
  obj-$(CONFIG_I2C_DAVINCI)     += i2c-davinci.o
  obj-$(CONFIG_I2C_ELEKTOR)     += i2c-elektor.o

diff --git a/target/linux/adm5120/patches/310-adm5120_wdt.patch b/target/linux/adm5120/patches/310-adm5120_wdt.patch
index 2f1ac5387a380dbef3e5e9af9a2c16c09b937b53..d7196b95909de97ca41cb1cbb72d5289e4ec4970 100644 (file)
--- a/target/linux/adm5120/patches/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches/310-adm5120_wdt.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.24/drivers/watchdog/Kconfig
+Index: linux-2.6.24.2/drivers/watchdog/Kconfig
 ===================================================================
---- linux-2.6.24.orig/drivers/watchdog/Kconfig
-+++ linux-2.6.24/drivers/watchdog/Kconfig
+--- linux-2.6.24.2.orig/drivers/watchdog/Kconfig
++++ linux-2.6.24.2/drivers/watchdog/Kconfig
 @@ -607,6 +607,18 @@ config SBC_EPX_C3_WATCHDOG
  
  # MIPS Architecture
@@ -21,10 +21,10 @@ Index: linux-2.6.24/drivers/watchdog/Kconfig
  config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_IP22
-Index: linux-2.6.24/drivers/watchdog/Makefile
+Index: linux-2.6.24.2/drivers/watchdog/Makefile
 ===================================================================
---- linux-2.6.24.orig/drivers/watchdog/Makefile
-+++ linux-2.6.24/drivers/watchdog/Makefile
+--- linux-2.6.24.2.orig/drivers/watchdog/Makefile
++++ linux-2.6.24.2/drivers/watchdog/Makefile
 @@ -89,6 +89,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
  # M68KNOMMU Architecture