[kernel] refresh 2.6.26 patches

SVN-Revision: 13135

diff --git a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch
index 0661ee1ad9b5cf6ef1b4984e707743aabda27ec9..1ba5db66e2497f3d92274d962cfc071fabcd382d 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch
+++ b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -18,6 +18,21 @@
+@@ -18,6 +18,21 @@ choice

        prompt "System type"
        default SGI_IP22
  
        prompt "System type"
        default SGI_IP22
  


@@ -22,7 +22,7 @@
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  

-@@ -687,6 +702,7 @@
+@@ -687,6 +702,7 @@ config WR_PPMC

  
  endchoice
  
  
  endchoice
  


@@ -32,7 +32,7 @@
  source "arch/mips/jazz/Kconfig"
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
  source "arch/mips/jazz/Kconfig"
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile

-@@ -174,6 +174,21 @@
+@@ -174,6 +174,21 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/

  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
  
  #
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
  
  #

diff --git a/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch b/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch
index c6559f2448ca48f8ec4c52ce3424ea92d9bbb17b..d7535aeaa66fedc2c30b0ef327bb9fb1bcc2ca32 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch
+++ b/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/maps/Kconfig
 +++ b/drivers/mtd/maps/Kconfig
 --- a/drivers/mtd/maps/Kconfig
 +++ b/drivers/mtd/maps/Kconfig

-@@ -586,5 +586,9 @@
+@@ -586,5 +586,9 @@ config MTD_PLATRAM

  
          This selection automatically selects the map_ram driver.
  
  
          This selection automatically selects the map_ram driver.
  


@@ -12,7 +12,7 @@
  
 --- a/drivers/mtd/maps/Makefile
 +++ b/drivers/mtd/maps/Makefile
  
 --- a/drivers/mtd/maps/Makefile
 +++ b/drivers/mtd/maps/Makefile

-@@ -44,6 +44,7 @@
+@@ -44,6 +44,7 @@ obj-$(CONFIG_MTD_DBOX2)              += dbox2-flash.

  obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
  obj-$(CONFIG_MTD_PCI)         += pci.o
  obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.o
  obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
  obj-$(CONFIG_MTD_PCI)         += pci.o
  obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.o

diff --git a/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch
index 38619a4da58f6cdfd3f8cb4b41ea728f48df9218..ac0c5e30599bee6089dec87fe4cea24e9aba1e17 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch
+++ b/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -613,6 +613,10 @@
+@@ -613,6 +613,10 @@ config MIPS_AU1X00_ENET

          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
  
          If you have an Alchemy Semi AU1X00 based system
          say Y.  Otherwise, say N.
  


@@ -13,7 +13,7 @@
        depends on PCI && SGI_IP27
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
        depends on PCI && SGI_IP27
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -186,6 +186,7 @@
+@@ -186,6 +186,7 @@ obj-$(CONFIG_SC92031) += sc92031.o

  # This is also a 82596 and should probably be merged
  obj-$(CONFIG_LP486E) += lp486e.o
  
  # This is also a 82596 and should probably be merged
  obj-$(CONFIG_LP486E) += lp486e.o
  

diff --git a/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch b/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch
index ae85e6468d1a3b7e14924cf3ca1fc4401f32ca8d..751af5a6b738814420e118935630e41e4fe1e94d 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch
+++ b/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch
@@ -13,7 +13,7 @@
        depends on USB
 --- a/drivers/usb/host/Makefile
 +++ b/drivers/usb/host/Makefile
        depends on USB
 --- a/drivers/usb/host/Makefile
 +++ b/drivers/usb/host/Makefile

-@@ -10,6 +10,7 @@
+@@ -10,6 +10,7 @@ isp1760-objs := isp1760-hcd.o isp1760-if

  
  obj-$(CONFIG_PCI)             += pci-quirks.o
  
  
  obj-$(CONFIG_PCI)             += pci-quirks.o
  


@@ -23,7 +23,7 @@
  obj-$(CONFIG_USB_OHCI_HCD)    += ohci-hcd.o
 --- a/drivers/usb/Makefile
 +++ b/drivers/usb/Makefile
  obj-$(CONFIG_USB_OHCI_HCD)    += ohci-hcd.o
 --- a/drivers/usb/Makefile
 +++ b/drivers/usb/Makefile

-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD)   += host/

  obj-$(CONFIG_USB_SL811_HCD)   += host/
  obj-$(CONFIG_USB_U132_HCD)    += host/
  obj-$(CONFIG_USB_R8A66597_HCD)        += host/
  obj-$(CONFIG_USB_SL811_HCD)   += host/
  obj-$(CONFIG_USB_U132_HCD)    += host/
  obj-$(CONFIG_USB_R8A66597_HCD)        += host/

diff --git a/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch
index cb46375abb9cef2c30f22fd4f4d9e08e153ff2d9..3df0f06baf5e8712266af514ebd95c5e79768399 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/pci/Makefile
 +++ b/arch/mips/pci/Makefile
 --- a/arch/mips/pci/Makefile
 +++ b/arch/mips/pci/Makefile

-@@ -48,3 +48,4 @@
+@@ -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_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o

diff --git a/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch
index a0d363a9b19957f001618d8ba83fc38b401e737e..1e3385d299ee0d569c82cad4db046cc6db9c81e4 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch
+++ b/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig

-@@ -207,4 +207,12 @@
+@@ -207,4 +207,12 @@ config LEDS_TRIGGER_NETDEV

          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  
          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  


@@ -15,7 +15,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile

-@@ -30,3 +30,4 @@
+@@ -30,3 +30,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += 

  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o

diff --git a/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch b/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch
index e34f7dc775cfe5d104d0ab7a282db1f02e29a4d3..17cd986aeef15bfccc7f5ab07bcc68803400cf96 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch
+++ b/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig

-@@ -174,6 +174,22 @@
+@@ -174,6 +174,22 @@ config MTD_AR7_PARTS

        ---help---
          TI AR7 partitioning support
  
        ---help---
          TI AR7 partitioning support
  


@@ -25,7 +25,7 @@
  config MTD_CHAR
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile
  config MTD_CHAR
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile

-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli

  obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
  obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
  obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
  obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o

diff --git a/target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch
index de3def9161cb1f5eb75c4c7b361f8d2d822ae8b7..65b34ac875148f14cdec0ebc9ae6aa450b73ab04 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch
@@ -20,7 +20,7 @@
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

-@@ -243,6 +250,41 @@
+@@ -243,6 +250,41 @@ static void fixup_s29gl032n_sectors(stru

        }
  }
  
        }
  }
  


@@ -62,7 +62,7 @@
  static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
  #ifdef AMD_BOOTLOC_BUG
  static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
  #ifdef AMD_BOOTLOC_BUG

-@@ -278,6 +320,9 @@
+@@ -278,6 +320,9 @@ static struct cfi_fixup fixup_table[] = 

         */
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
        { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
         */
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
        { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },


@@ -74,7 +74,7 @@
  
 --- a/drivers/mtd/chips/Kconfig
 +++ b/drivers/mtd/chips/Kconfig
  
 --- a/drivers/mtd/chips/Kconfig
 +++ b/drivers/mtd/chips/Kconfig

-@@ -196,6 +196,14 @@
+@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD

          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.
  
          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.
  

diff --git a/target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch
index d08786355c54c5e044a7b98aa725bc6979b92934..e84c44fc484ef7c9dc0d92fc56886e0f9681c8b4 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch
+++ b/target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch
@@ -11,7 +11,7 @@
  #define PM49FL002     0x006D
  #define PM49FL004     0x006E
  #define PM49FL008     0x006A
  #define PM49FL002     0x006D
  #define PM49FL004     0x006E
  #define PM49FL008     0x006A

-@@ -1173,6 +1177,54 @@
+@@ -1173,6 +1177,54 @@ static const struct amd_flash_info jedec

                        ERASEINFO(0x02000,2),
                        ERASEINFO(0x04000,1),
                }
                        ERASEINFO(0x02000,2),
                        ERASEINFO(0x04000,1),
                }

diff --git a/target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch b/target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch
index 267293aa56725698db470f0b60a6db70f1cdc47a..e4c86908a8e5294081f6978028a0f228117ab4c5 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch
+++ b/target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig

-@@ -57,6 +57,11 @@
+@@ -57,6 +57,11 @@ config MTD_ROOTFS_SPLIT

        depends on MTD_PARTITIONS
        default y
  
        depends on MTD_PARTITIONS
        default y
  


@@ -14,7 +14,7 @@
        depends on MTD_PARTITIONS
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile
        depends on MTD_PARTITIONS
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile

-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ mtd-y                          := mtdcore.o mtdsuper.o

  mtd-$(CONFIG_MTD_PARTITIONS)  += mtdpart.o
  
  obj-$(CONFIG_MTD_CONCAT)      += mtdconcat.o
  mtd-$(CONFIG_MTD_PARTITIONS)  += mtdpart.o
  
  obj-$(CONFIG_MTD_CONCAT)      += mtdconcat.o

diff --git a/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch b/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch
index 242c6dd989323629afb2822240e6ab0cba333346..e1001818491ef9e976dd0b29304b9b9d0bafdfd9 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch
+++ b/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ata/Makefile
 +++ b/drivers/ata/Makefile
 --- a/drivers/ata/Makefile
 +++ b/drivers/ata/Makefile

-@@ -72,6 +72,7 @@
+@@ -72,6 +72,7 @@ obj-$(CONFIG_PATA_BF54X)     += pata_bf54x.o

  obj-$(CONFIG_PATA_PLATFORM)   += pata_platform.o
  obj-$(CONFIG_PATA_OF_PLATFORM)        += pata_of_platform.o
  obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o
  obj-$(CONFIG_PATA_PLATFORM)   += pata_platform.o
  obj-$(CONFIG_PATA_OF_PLATFORM)        += pata_of_platform.o
  obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o


@@ -10,7 +10,7 @@
  # Should be last but one libata driver
 --- a/drivers/ata/Kconfig
 +++ b/drivers/ata/Kconfig
  # Should be last but one libata driver
 --- a/drivers/ata/Kconfig
 +++ b/drivers/ata/Kconfig

-@@ -566,6 +566,15 @@
+@@ -566,6 +566,15 @@ config PATA_RADISYS

  
          If unsure, say N.
  
  
          If unsure, say N.
  

diff --git a/target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch b/target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch
index 39c1dea24c4fc0e1b2789b1af6100255d1c786d1..18fbc69493c1e449bd5d8dbbcf4e3c5f650d2e94 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch
+++ b/target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch
@@ -14,7 +14,7 @@
  
  #define AMBA_ISR_PASS_LIMIT   256
  
  
  #define AMBA_ISR_PASS_LIMIT   256
  

-@@ -82,9 +81,9 @@
+@@ -82,9 +81,9 @@ static void pl010_stop_tx(struct uart_po

        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  
        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  


@@ -26,7 +26,7 @@
  }
  
  static void pl010_start_tx(struct uart_port *port)
  }
  
  static void pl010_start_tx(struct uart_port *port)

-@@ -92,9 +91,9 @@
+@@ -92,9 +91,9 @@ static void pl010_start_tx(struct uart_p

        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  
        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  


@@ -38,7 +38,7 @@
  }
  
  static void pl010_stop_rx(struct uart_port *port)
  }
  
  static void pl010_stop_rx(struct uart_port *port)

-@@ -102,9 +101,9 @@
+@@ -102,9 +101,9 @@ static void pl010_stop_rx(struct uart_po

        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  
        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  


@@ -50,7 +50,7 @@
  }
  
  static void pl010_enable_ms(struct uart_port *port)
  }
  
  static void pl010_enable_ms(struct uart_port *port)

-@@ -112,9 +111,9 @@
+@@ -112,9 +111,9 @@ static void pl010_enable_ms(struct uart_

        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  
        struct uart_amba_port *uap = (struct uart_amba_port *)port;
        unsigned int cr;
  


@@ -62,7 +62,7 @@
  }
  
  static void pl010_rx_chars(struct uart_amba_port *uap)
  }
  
  static void pl010_rx_chars(struct uart_amba_port *uap)

-@@ -122,9 +121,9 @@
+@@ -122,9 +121,9 @@ static void pl010_rx_chars(struct uart_a

        struct tty_struct *tty = uap->port.info->tty;
        unsigned int status, ch, flag, rsr, max_count = 256;
  
        struct tty_struct *tty = uap->port.info->tty;
        unsigned int status, ch, flag, rsr, max_count = 256;
  


@@ -74,7 +74,7 @@
                flag = TTY_NORMAL;
  
                uap->port.icount.rx++;
                flag = TTY_NORMAL;
  
                uap->port.icount.rx++;

-@@ -133,9 +132,9 @@
+@@ -133,9 +132,9 @@ static void pl010_rx_chars(struct uart_a

                 * Note that the error handling code is
                 * out of the main execution path
                 */
                 * Note that the error handling code is
                 * out of the main execution path
                 */


@@ -86,7 +86,7 @@
  
                        if (rsr & UART01x_RSR_BE) {
                                rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
  
                        if (rsr & UART01x_RSR_BE) {
                                rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);

-@@ -165,7 +164,7 @@
+@@ -165,7 +164,7 @@ static void pl010_rx_chars(struct uart_a

                uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);
  
        ignore_char:
                uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);
  
        ignore_char:


@@ -95,7 +95,7 @@
        }
        spin_unlock(&uap->port.lock);
        tty_flip_buffer_push(tty);
        }
        spin_unlock(&uap->port.lock);
        tty_flip_buffer_push(tty);

-@@ -178,7 +177,7 @@
+@@ -178,7 +177,7 @@ static void pl010_tx_chars(struct uart_a

        int count;
  
        if (uap->port.x_char) {
        int count;
  
        if (uap->port.x_char) {


@@ -104,7 +104,7 @@
                uap->port.icount.tx++;
                uap->port.x_char = 0;
                return;
                uap->port.icount.tx++;
                uap->port.x_char = 0;
                return;

-@@ -190,7 +189,7 @@
+@@ -190,7 +189,7 @@ static void pl010_tx_chars(struct uart_a

  
        count = uap->port.fifosize >> 1;
        do {
  
        count = uap->port.fifosize >> 1;
        do {


@@ -113,7 +113,7 @@
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                uap->port.icount.tx++;
                if (uart_circ_empty(xmit))
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
                uap->port.icount.tx++;
                if (uart_circ_empty(xmit))

-@@ -208,9 +207,9 @@
+@@ -208,9 +207,9 @@ static void pl010_modem_status(struct ua

  {
        unsigned int status, delta;
  
  {
        unsigned int status, delta;
  


@@ -125,7 +125,7 @@
  
        delta = status ^ uap->old_status;
        uap->old_status = status;
  
        delta = status ^ uap->old_status;
        uap->old_status = status;

-@@ -238,7 +237,7 @@
+@@ -238,7 +237,7 @@ static irqreturn_t pl010_int(int irq, vo

  
        spin_lock(&uap->port.lock);
  
  
        spin_lock(&uap->port.lock);
  


@@ -134,7 +134,7 @@
        if (status) {
                do {
                        if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
        if (status) {
                do {
                        if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))

-@@ -251,7 +250,7 @@
+@@ -251,7 +250,7 @@ static irqreturn_t pl010_int(int irq, vo

                        if (pass_counter-- == 0)
                                break;
  
                        if (pass_counter-- == 0)
                                break;
  


@@ -143,7 +143,7 @@
                } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
                                   UART010_IIR_TIS));
                handled = 1;
                } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
                                   UART010_IIR_TIS));
                handled = 1;

-@@ -265,7 +264,7 @@
+@@ -265,7 +264,7 @@ static irqreturn_t pl010_int(int irq, vo

  static unsigned int pl010_tx_empty(struct uart_port *port)
  {
        struct uart_amba_port *uap = (struct uart_amba_port *)port;
  static unsigned int pl010_tx_empty(struct uart_port *port)
  {
        struct uart_amba_port *uap = (struct uart_amba_port *)port;


@@ -152,7 +152,7 @@
        return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
  }
  
        return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
  }
  

-@@ -275,7 +274,7 @@
+@@ -275,7 +274,7 @@ static unsigned int pl010_get_mctrl(stru

        unsigned int result = 0;
        unsigned int status;
  
        unsigned int result = 0;
        unsigned int status;
  


@@ -161,7 +161,7 @@
        if (status & UART01x_FR_DCD)
                result |= TIOCM_CAR;
        if (status & UART01x_FR_DSR)
        if (status & UART01x_FR_DCD)
                result |= TIOCM_CAR;
        if (status & UART01x_FR_DSR)

-@@ -301,12 +300,12 @@
+@@ -301,12 +300,12 @@ static void pl010_break_ctl(struct uart_

        unsigned int lcr_h;
  
        spin_lock_irqsave(&uap->port.lock, flags);
        unsigned int lcr_h;
  
        spin_lock_irqsave(&uap->port.lock, flags);


@@ -176,7 +176,7 @@
        spin_unlock_irqrestore(&uap->port.lock, flags);
  }
  
        spin_unlock_irqrestore(&uap->port.lock, flags);
  }
  

-@@ -334,12 +333,12 @@
+@@ -334,12 +333,12 @@ static int pl010_startup(struct uart_por

        /*
         * initialise the old status of the modem signals
         */
        /*
         * initialise the old status of the modem signals
         */


@@ -191,7 +191,7 @@
               uap->port.membase + UART010_CR);
  
        return 0;
               uap->port.membase + UART010_CR);
  
        return 0;

-@@ -362,10 +361,10 @@
+@@ -362,10 +361,10 @@ static void pl010_shutdown(struct uart_p

        /*
         * disable all interrupts, disable the port
         */
        /*
         * disable all interrupts, disable the port
         */


@@ -204,7 +204,7 @@
                ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
               uap->port.membase + UART010_LCRH);
  
                ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
               uap->port.membase + UART010_LCRH);
  

-@@ -387,7 +386,7 @@
+@@ -387,7 +386,7 @@ pl010_set_termios(struct uart_port *port

        /*
         * Ask the core to calculate the divisor for us.
         */
        /*
         * Ask the core to calculate the divisor for us.
         */


@@ -213,7 +213,7 @@
        quot = uart_get_divisor(port, baud);
  
        switch (termios->c_cflag & CSIZE) {
        quot = uart_get_divisor(port, baud);
  
        switch (termios->c_cflag & CSIZE) {

-@@ -450,25 +449,25 @@
+@@ -450,25 +449,25 @@ pl010_set_termios(struct uart_port *port

                uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX;
  
        /* first, disable everything */
                uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX;
  
        /* first, disable everything */


@@ -245,7 +245,7 @@
  
        spin_unlock_irqrestore(&uap->port.lock, flags);
  }
  
        spin_unlock_irqrestore(&uap->port.lock, flags);
  }

-@@ -540,7 +539,7 @@
+@@ -540,7 +539,7 @@ static struct uart_ops amba_pl010_pops =

        .verify_port    = pl010_verify_port,
  };
  
        .verify_port    = pl010_verify_port,
  };
  


@@ -254,7 +254,7 @@
  
  #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
  
  
  #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
  

-@@ -550,10 +549,10 @@
+@@ -550,10 +549,10 @@ static void pl010_console_putchar(struct

        unsigned int status;
  
        do {
        unsigned int status;
  
        do {


@@ -267,7 +267,7 @@
  }
  
  static void
  }
  
  static void

-@@ -567,8 +566,8 @@
+@@ -567,8 +566,8 @@ pl010_console_write(struct console *co, 

        /*
         *      First save the CR then disable the interrupts
         */
        /*
         *      First save the CR then disable the interrupts
         */


@@ -278,7 +278,7 @@
  
        uart_console_write(&uap->port, s, count, pl010_console_putchar);
  
  
        uart_console_write(&uap->port, s, count, pl010_console_putchar);
  

-@@ -577,10 +576,10 @@
+@@ -577,10 +576,10 @@ pl010_console_write(struct console *co, 

         *      and restore the TCR
         */
        do {
         *      and restore the TCR
         */
        do {


@@ -291,7 +291,7 @@
  
        clk_disable(uap->clk);
  }
  
        clk_disable(uap->clk);
  }

-@@ -589,9 +588,9 @@
+@@ -589,9 +588,9 @@ static void __init

  pl010_console_get_options(struct uart_amba_port *uap, int *baud,
                             int *parity, int *bits)
  {
  pl010_console_get_options(struct uart_amba_port *uap, int *baud,
                             int *parity, int *bits)
  {


@@ -303,7 +303,7 @@
  
                *parity = 'n';
                if (lcr_h & UART01x_LCRH_PEN) {
  
                *parity = 'n';
                if (lcr_h & UART01x_LCRH_PEN) {

-@@ -606,8 +605,8 @@
+@@ -606,8 +605,8 @@ pl010_console_get_options(struct uart_am

                else
                        *bits = 8;
  
                else
                        *bits = 8;
  


@@ -314,7 +314,7 @@
                *baud = uap->port.uartclk / (16 * (quot + 1));
        }
  }
                *baud = uap->port.uartclk / (16 * (quot + 1));
        }
  }

-@@ -625,7 +624,7 @@
+@@ -625,7 +624,7 @@ static int __init pl010_console_setup(st

         * if so, search for the first available port that does have
         * console support.
         */
         * if so, search for the first available port that does have
         * console support.
         */


@@ -323,7 +323,7 @@
                co->index = 0;
        uap = amba_ports[co->index];
        if (!uap)
                co->index = 0;
        uap = amba_ports[co->index];
        if (!uap)

-@@ -643,7 +642,7 @@
+@@ -643,7 +642,7 @@ static int __init pl010_console_setup(st

  
  static struct uart_driver amba_reg;
  static struct console amba_console = {
  
  static struct uart_driver amba_reg;
  static struct console amba_console = {


@@ -332,7 +332,7 @@
        .write          = pl010_console_write,
        .device         = uart_console_device,
        .setup          = pl010_console_setup,
        .write          = pl010_console_write,
        .device         = uart_console_device,
        .setup          = pl010_console_setup,

-@@ -659,11 +658,11 @@
+@@ -659,11 +658,11 @@ static struct console amba_console = {

  
  static struct uart_driver amba_reg = {
        .owner                  = THIS_MODULE,
  
  static struct uart_driver amba_reg = {
        .owner                  = THIS_MODULE,


@@ -349,7 +349,7 @@
  
 --- a/drivers/serial/Kconfig
 +++ b/drivers/serial/Kconfig
  
 --- a/drivers/serial/Kconfig
 +++ b/drivers/serial/Kconfig

-@@ -287,10 +287,25 @@
+@@ -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
        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-2.6.26/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
index 40728a970758bc3d8520c3d69f9cf5eb86eebe34..b13a779bbffd64ff9e8e6c66af6a32dc27643cc4 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
+++ b/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
@@ -1,6 +1,6 @@
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig

-@@ -42,6 +42,12 @@
+@@ -42,6 +42,12 @@ config PCI_DEBUG

  
          When in doubt, say N.
  
  
          When in doubt, say N.
  


@@ -23,7 +23,7 @@
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.

-@@ -1495,6 +1496,7 @@
+@@ -1495,6 +1496,7 @@ static void __devinit fixup_rev1_53c810(

        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);


@@ -31,7 +31,7 @@
  
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
  {
  
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
  {

-@@ -1561,6 +1563,7 @@
+@@ -1561,6 +1563,7 @@ void pci_fixup_device(enum pci_fixup_pas

  }
  EXPORT_SYMBOL(pci_fixup_device);
  
  }
  EXPORT_SYMBOL(pci_fixup_device);
  


@@ -39,7 +39,7 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {

-@@ -1934,3 +1937,4 @@
+@@ -1934,3 +1937,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT

                        quirk_msi_intx_disable_bug);
  
  #endif /* CONFIG_PCI_MSI */
                        quirk_msi_intx_disable_bug);
  
  #endif /* CONFIG_PCI_MSI */

diff --git a/target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch b/target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch
index 5a3c11aabe65372166a62e8004689283b856986e..bb94fd05eac810cfe0c8ca0175029a6d8f461e5d 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch
+++ b/target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/leds-gpio.c
 +++ b/drivers/leds/leds-gpio.c
 --- a/drivers/leds/leds-gpio.c
 +++ b/drivers/leds/leds-gpio.c

-@@ -43,13 +43,17 @@
+@@ -43,13 +43,17 @@ static void gpio_led_set(struct led_clas

                container_of(led_cdev, struct gpio_led_data, cdev);
        int level;
  
                container_of(led_cdev, struct gpio_led_data, cdev);
        int level;
  

diff --git a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
index 423b130cc31e458e9c07f6eee18833b10cd44e01..f6822ecd318ac8fa29df95f5c769a1d08b1ed98a 100644 (file)
--- a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
@@ -1,6 +1,6 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig

-@@ -632,6 +632,18 @@
+@@ -632,6 +632,18 @@ config SBC_EPX_C3_WATCHDOG

  
  # MIPS Architecture
  
  
  # MIPS Architecture
  


@@ -21,7 +21,7 @@
        depends on SGI_HAS_INDYDOG
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
        depends on SGI_HAS_INDYDOG
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile

-@@ -91,6 +91,7 @@
+@@ -91,6 +91,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc

  # M68KNOMMU Architecture
  
  # MIPS Architecture
  # M68KNOMMU Architecture
  
  # MIPS Architecture

diff --git a/target/linux/ar7/patches-2.6.26/100-board_support.patch b/target/linux/ar7/patches-2.6.26/100-board_support.patch
index 82d09b0f0171984880a65691f0e8c82f6c1ad4db..95757d4643e806ee83e3e26432fab04a720e541b 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.26/100-board_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -18,6 +18,23 @@
+@@ -18,6 +18,23 @@ choice

        prompt "System type"
        default SGI_IP22
  
        prompt "System type"
        default SGI_IP22
  


@@ -26,7 +26,7 @@
  
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c
  
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c

-@@ -1188,9 +1188,22 @@
+@@ -1188,9 +1188,22 @@ void *set_except_vector(int n, void *add

  
        exception_handlers[n] = handler;
        if (n == 0 && cpu_has_divec) {
  
        exception_handlers[n] = handler;
        if (n == 0 && cpu_has_divec) {


@@ -54,7 +54,7 @@
  }
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
  }
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile

-@@ -167,6 +167,13 @@
+@@ -167,6 +167,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s

  #
  
  #
  #
  
  #


@@ -70,7 +70,7 @@
  core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
 --- a/include/asm-mips/page.h
 +++ b/include/asm-mips/page.h
  core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
 --- a/include/asm-mips/page.h
 +++ b/include/asm-mips/page.h

-@@ -182,8 +182,10 @@
+@@ -182,8 +182,10 @@ typedef struct { unsigned long pgprot; }

  #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
  
  #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
  

diff --git a/target/linux/ar7/patches-2.6.26/110-flash.patch b/target/linux/ar7/patches-2.6.26/110-flash.patch
index 4740e3421e4c14f038ce80bf42d6061df0657dc5..bda6e3727cd11db7c9932aabe9ba57e321cb028f 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.26/110-flash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig

-@@ -174,6 +174,12 @@
+@@ -174,6 +174,12 @@ config MTD_AR7_PARTS

        ---help---
          TI AR7 partitioning support
  
        ---help---
          TI AR7 partitioning support
  


@@ -15,7 +15,7 @@
  config MTD_CHAR
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile
  config MTD_CHAR
 --- a/drivers/mtd/Makefile
 +++ b/drivers/mtd/Makefile

-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli

  obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
  obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
  obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
  obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
  obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o


@@ -25,7 +25,7 @@
  obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
 --- a/drivers/mtd/maps/physmap.c
 +++ b/drivers/mtd/maps/physmap.c
  obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
 --- a/drivers/mtd/maps/physmap.c
 +++ b/drivers/mtd/maps/physmap.c

-@@ -87,7 +87,8 @@
+@@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p

  
  static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
  #ifdef CONFIG_MTD_PARTITIONS
  
  static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
  #ifdef CONFIG_MTD_PARTITIONS

diff --git a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
index a3ce669400ddd05e5a209527c64303cc246f3774..dfda2310e2246ad288484980221fb84361ff855c 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
+++ b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
@@ -1,6 +1,6 @@
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig

-@@ -960,6 +960,15 @@
+@@ -960,6 +960,15 @@ config MWAVE

          To compile this driver as a module, choose M here: the
          module will be called mwave.
  
          To compile this driver as a module, choose M here: the
          module will be called mwave.
  


@@ -18,7 +18,7 @@
        depends on SCx200
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
        depends on SCx200
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile

-@@ -91,6 +91,7 @@
+@@ -91,6 +91,7 @@ obj-$(CONFIG_COBALT_LCD)     += lcd.o

  obj-$(CONFIG_PPDEV)           += ppdev.o
  obj-$(CONFIG_NWBUTTON)                += nwbutton.o
  obj-$(CONFIG_NWFLASH)         += nwflash.o
  obj-$(CONFIG_PPDEV)           += ppdev.o
  obj-$(CONFIG_NWBUTTON)                += nwbutton.o
  obj-$(CONFIG_NWFLASH)         += nwflash.o

diff --git a/target/linux/ar7/patches-2.6.26/130-vlynq.patch b/target/linux/ar7/patches-2.6.26/130-vlynq.patch
index c1e04a6dbf3a9364528a1e80c658e2dbab7970bb..41940b3b537dc4b0988242c0d949065ea309bb20 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/130-vlynq.patch
+++ b/target/linux/ar7/patches-2.6.26/130-vlynq.patch
@@ -1,6 +1,6 @@
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig

-@@ -100,5 +100,7 @@
+@@ -100,5 +100,7 @@ source "drivers/auxdisplay/Kconfig"

  
  source "drivers/uio/Kconfig"
  
  
  source "drivers/uio/Kconfig"
  


@@ -10,7 +10,7 @@
  endmenu
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
  endmenu
 --- a/drivers/Makefile
 +++ b/drivers/Makefile

-@@ -92,5 +92,6 @@
+@@ -92,5 +92,6 @@ obj-$(CONFIG_DCA)            += dca/

  obj-$(CONFIG_HID)             += hid/
  obj-$(CONFIG_PPC_PS3)         += ps3/
  obj-$(CONFIG_OF)              += of/
  obj-$(CONFIG_HID)             += hid/
  obj-$(CONFIG_PPC_PS3)         += ps3/
  obj-$(CONFIG_OF)              += of/

diff --git a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
index 18477997e8ffb66e1a5fbce72f2d70bd33116810..423a147de17cd6b86ccf9e828052c85233178610 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
+++ b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -1867,7 +1867,7 @@
+@@ -1867,7 +1867,7 @@ config SC92031

  
  config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
  
  config CPMAC
        tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

diff --git a/target/linux/ar7/patches-2.6.26/200-mtd_fixes.patch b/target/linux/ar7/patches-2.6.26/200-mtd_fixes.patch
index 850a64302438fb92a1eb3c159182ba293e18cf25..729fd5d18b521455f38f04efc00bcb57376f4662 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/200-mtd_fixes.patch
+++ b/target/linux/ar7/patches-2.6.26/200-mtd_fixes.patch
@@ -11,7 +11,7 @@
  struct ar7_bin_rec {
        unsigned int checksum;
        unsigned int length;
  struct ar7_bin_rec {
        unsigned int checksum;
        unsigned int length;

-@@ -47,7 +51,8 @@
+@@ -47,7 +51,8 @@ static int create_mtd_partitions(struct 

                                 unsigned long origin)
  {
        struct ar7_bin_rec header;
                                 unsigned long origin)
  {
        struct ar7_bin_rec header;


@@ -21,7 +21,7 @@
        unsigned int pre_size = master->erasesize, post_size = 0;
        unsigned int root_offset = ROOT_OFFSET;
  
        unsigned int pre_size = master->erasesize, post_size = 0;
        unsigned int root_offset = ROOT_OFFSET;
  

-@@ -66,7 +71,7 @@
+@@ -66,7 +71,7 @@ static int create_mtd_partitions(struct 

        do { /* Try 10 blocks starting from master->erasesize */
                offset = pre_size;
                master->read(master, offset,
        do { /* Try 10 blocks starting from master->erasesize */
                offset = pre_size;
                master->read(master, offset,


@@ -30,7 +30,7 @@
                if (!strncmp((char *)&header, "TIENV0.8", 8))
                        ar7_parts[1].offset = pre_size;
                if (header.checksum == LOADER_MAGIC1)
                if (!strncmp((char *)&header, "TIENV0.8", 8))
                        ar7_parts[1].offset = pre_size;
                if (header.checksum == LOADER_MAGIC1)

-@@ -88,7 +93,7 @@
+@@ -88,7 +93,7 @@ static int create_mtd_partitions(struct 

                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),
                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),


@@ -39,7 +39,7 @@
                }
                root_offset = offset + sizeof(header) + 4;
                break;
                }
                root_offset = offset + sizeof(header) + 4;
                break;

-@@ -96,10 +101,10 @@
+@@ -96,10 +101,10 @@ static int create_mtd_partitions(struct 

                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),
                while (header.length) {
                        offset += sizeof(header) + header.length;
                        master->read(master, offset, sizeof(header),

diff --git a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
index 00709186ef05940b604ba42d2fac6650a35a567a..6ce59edf2cf4b4078f8da023c5365c00fe80bc8c 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
@@ -1,6 +1,6 @@
 --- a/drivers/serial/8250.c
 +++ b/drivers/serial/8250.c
 --- a/drivers/serial/8250.c
 +++ b/drivers/serial/8250.c

-@@ -266,6 +266,13 @@
+@@ -266,6 +266,13 @@ static const struct serial8250_config ua

                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },
                .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
                .flags          = UART_CAP_FIFO,
        },


@@ -14,7 +14,7 @@
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)
  };
  
  #if defined (CONFIG_SERIAL_8250_AU1X00)

-@@ -2524,7 +2531,11 @@
+@@ -2524,7 +2531,11 @@ static void serial8250_console_putchar(s

  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
  
  {
        struct uart_8250_port *up = (struct uart_8250_port *)port;
  

diff --git a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
index 63ced873ebf70dbecda0523ac6f0c17b29aea163..d701e8b813ee834f92a28d662fc71e091a787c07 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
+++ b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
@@ -19,7 +19,7 @@ because other drivers do it in the same way.
 
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
 
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c

-@@ -627,7 +627,7 @@
+@@ -627,7 +627,7 @@ static void cpmac_end_xmit(struct net_de

                dev_kfree_skb_irq(desc->skb);
                desc->skb = NULL;
  #ifdef CONFIG_NETDEVICES_MULTIQUEUE
                dev_kfree_skb_irq(desc->skb);
                desc->skb = NULL;
  #ifdef CONFIG_NETDEVICES_MULTIQUEUE


@@ -28,7 +28,7 @@ because other drivers do it in the same way.
                        netif_wake_subqueue(dev, queue);
  #else
                if (netif_queue_stopped(dev))
                        netif_wake_subqueue(dev, queue);
  #else
                if (netif_queue_stopped(dev))

-@@ -638,7 +638,7 @@
+@@ -638,7 +638,7 @@ static void cpmac_end_xmit(struct net_de

                        printk(KERN_WARNING
                               "%s: end_xmit: spurious interrupt\n", dev->name);
  #ifdef CONFIG_NETDEVICES_MULTIQUEUE
                        printk(KERN_WARNING
                               "%s: end_xmit: spurious interrupt\n", dev->name);
  #ifdef CONFIG_NETDEVICES_MULTIQUEUE


@@ -37,7 +37,7 @@ because other drivers do it in the same way.
                        netif_wake_subqueue(dev, queue);
  #else
                if (netif_queue_stopped(dev))
                        netif_wake_subqueue(dev, queue);
  #else
                if (netif_queue_stopped(dev))

-@@ -1124,7 +1124,7 @@
+@@ -1124,7 +1124,7 @@ static int external_switch;

  
  static int __devinit cpmac_probe(struct platform_device *pdev)
  {
  
  static int __devinit cpmac_probe(struct platform_device *pdev)
  {


@@ -46,7 +46,7 @@ because other drivers do it in the same way.
        char *mdio_bus_id = "0";
        struct resource *mem;
        struct cpmac_priv *priv;
        char *mdio_bus_id = "0";
        struct resource *mem;
        struct cpmac_priv *priv;

-@@ -1152,7 +1152,11 @@
+@@ -1152,7 +1152,11 @@ static int __devinit cpmac_probe(struct 

                }
        }
  
                }
        }
  


@@ -58,7 +58,7 @@ because other drivers do it in the same way.
  
        if (!dev) {
                printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
  
        if (!dev) {
                printk(KERN_ERR "cpmac: Unable to allocate net_device\n");

-@@ -1179,7 +1183,9 @@
+@@ -1179,7 +1183,9 @@ static int __devinit cpmac_probe(struct 

        dev->set_multicast_list = cpmac_set_multicast_list;
        dev->tx_timeout         = cpmac_tx_timeout;
        dev->ethtool_ops        = &cpmac_ethtool_ops;
        dev->set_multicast_list = cpmac_set_multicast_list;
        dev->tx_timeout         = cpmac_tx_timeout;
        dev->ethtool_ops        = &cpmac_ethtool_ops;

diff --git a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
index 43479f881e244d83bd8d82e45d1e1ad5f84be3f8..74b1775a4a4a57cf39d06758f831a1f477f44494 100644 (file)
--- a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
@@ -1,6 +1,6 @@
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c

-@@ -948,7 +948,8 @@
+@@ -948,7 +948,8 @@ static void cpmac_adjust_link(struct net

        int new_state = 0;
  
        spin_lock(&priv->lock);
        int new_state = 0;
  
        spin_lock(&priv->lock);


@@ -10,7 +10,7 @@
                netif_start_queue(dev);
                if (priv->phy->duplex != priv->oldduplex) {
                        new_state = 1;
                netif_start_queue(dev);
                if (priv->phy->duplex != priv->oldduplex) {
                        new_state = 1;

-@@ -960,11 +961,11 @@
+@@ -960,11 +961,11 @@ static void cpmac_adjust_link(struct net

                        priv->oldspeed = priv->phy->speed;
                }
  
                        priv->oldspeed = priv->phy->speed;
                }
  

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 ebf8d60394642463642ed0e48718918f44456c09..3702b652c75001bd1015da0213765f3a7b7ef5ec 100644 (file)
--- 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
 --- 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
  
  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
  #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"
  
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  


@@ -60,7 +60,7 @@
  config BASLER_EXCITE
        bool "Basler eXcite smart camera"
        select CEVT_R4K
  config BASLER_EXCITE
        bool "Basler eXcite smart camera"
        select CEVT_R4K

-@@ -687,6 +705,7 @@
+@@ -687,6 +705,7 @@ config WR_PPMC

  
  endchoice
  
  
  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 8ae604a2430bba94adcc64dda948557b1f978eba..85e22f8c70f7a9817a193bd429111bab95be67c4 100644 (file)
--- 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
 --- 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
  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 99b283f8f9eab07767fa93905f56e07db35250ac..38c0e8569ff1ed40e9d83ed9b26298cdf01cb5f1 100644 (file)
--- 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
 --- 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
  
        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
  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.
  
          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
        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
  
  #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
  #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
  
  #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
  {
 --- 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
  
  #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 b2d11ff086b8f9c82ba2c44503971f18bcae662d..e0bd2c7aaf1529f3278b114e9e09ef94a8e0ee44 100644 (file)
--- 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
 --- 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
  
  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
        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)
  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 2858666b15d4906e1ac0c4d7f15a8807574433b2..e638157a0e03ecb823d96a023375dbda4f803a7c 100644 (file)
--- 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
 --- 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.
  
  
          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 219dfc0a8515bf99038b112b6966154e99c51014..fde70f35f362e7b4defa80ecc035d2ebe56c3061 100644 (file)
--- 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
 --- 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.
  
        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
  # 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
  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 8bfe9dd43817550afb0e69509e23e63fbaac46b6..c20bd940f590488eb0cd98a8e960e33abfc7f8bb 100644 (file)
--- 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
 --- 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, },
  
        { "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 9b69eca7ccead0f312a2ec5137e46a60f7c34b64..7b9c2ec47771b991ef7ed7a0fb86723a9a5802a6 100644 (file)
--- 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
 --- 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.
  
        ---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
        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
  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 3e89407d0de4e6e3bcc643a687e245c0a0dd00e2..c46a56a50aa51aec973b58ddd43bc365260b2f46 100644 (file)
--- 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
 --- 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
  
        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);
  
        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 */
        }
        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 c8be04bfed114747e28a1c360358fde4d210e325..a0d55d666e0f7c510f8cc73b9b02afb29ba5e341 100644 (file)
--- 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
 --- 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.
  
          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
  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
  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 e8af1eeb879a03d380e10f5dbc6e60cb44b79ada..21266f89aead059eda659bfb7688bf61d4337a1e 100644 (file)
--- 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
 --- 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/
  #
  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
  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
  
  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 755b920e411cf6fcf1809a87b5bd17283befbb70..abcdfb5817aebc5840026981409bfd04887eeef1 100644 (file)
--- 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
 +
 --- 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
  
  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
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -880,6 +880,9 @@
+@@ -880,6 +880,9 @@ config MYLOADER

  config SYNC_R4K
        bool
  
  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 2920258075f2ced34094d85e52e25ad5775f999d..3eaeb8bd33818bfe647e4543e6d5063af40930e7 100644 (file)
--- 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);
  
  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;
         */
        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
                        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);
  #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 bdf0d0fb69180229c21ca57159b7542c094daad2..61d9610cf4f65d47e179d072533662ee343ae58b 100644 (file)
--- 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)
  {
  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);
        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);
        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());
         */
        if (c0_compare_int_pending()) {
                write_c0_compare(read_c0_count());


@@ -40,7 +40,7 @@
                if (c0_compare_int_pending())
                        return 0;
        }
                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);
                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 */
                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  */
  
        while ((int)(read_c0_count() - cnt) <= 0)
                ;       /* Wait for expiry  */
  

diff --git a/target/linux/atheros/patches-2.6.26/100-board.patch b/target/linux/atheros/patches-2.6.26/100-board.patch
index 9e68eddd4e8d0b79601f6af0220098df30c24fc8..3bd297b25db6e0798ad6274920662a253f3f0407 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/100-board.patch
+++ b/target/linux/atheros/patches-2.6.26/100-board.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -59,6 +59,18 @@
+@@ -59,6 +59,18 @@ config BCM47XX

        help
         Support for BCM47XX based boards
  
        help
         Support for BCM47XX based boards
  


@@ -19,7 +19,7 @@
  config MIPS_COBALT
        bool "Cobalt Server"
        select CEVT_R4K
  config MIPS_COBALT
        bool "Cobalt Server"
        select CEVT_R4K

-@@ -687,6 +699,7 @@
+@@ -687,6 +699,7 @@ config WR_PPMC

  
  endchoice
  
  
  endchoice
  


@@ -29,7 +29,7 @@
  source "arch/mips/jazz/Kconfig"
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
  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
  
  #
  load-$(CONFIG_MIPS_XXS1500)   += 0xffffffff80100000
  
  #

diff --git a/target/linux/atheros/patches-2.6.26/110-spiflash.patch b/target/linux/atheros/patches-2.6.26/110-spiflash.patch
index 527198c210bcefe47dee295b5ce565483bd5cdda..8a1d886fe5788fa5612ec987a8c0e898e33e1e12 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/110-spiflash.patch
+++ b/target/linux/atheros/patches-2.6.26/110-spiflash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig

-@@ -84,6 +84,10 @@
+@@ -84,6 +84,10 @@ config M25PXX_USE_FAST_READ

        help
          This option enables FAST_READ access supported by ST M25Pxx.
  
        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
        help
 --- a/drivers/mtd/devices/Makefile
 +++ b/drivers/mtd/devices/Makefile

-@@ -17,3 +17,4 @@
+@@ -17,3 +17,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
  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.26/120-watchdog.patch b/target/linux/atheros/patches-2.6.26/120-watchdog.patch
index d99b8c7813115487de7b0a84dcc681a3fe771d9d..5e33c618746b30a6374cdd3f75fb669e739f3d53 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/120-watchdog.patch
+++ b/target/linux/atheros/patches-2.6.26/120-watchdog.patch
@@ -1,6 +1,6 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig

-@@ -683,6 +683,12 @@
+@@ -683,6 +683,12 @@ config TXX9_WDT

        help
          Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
  
        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
  # 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
  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.26/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch
index 13580d18014d0b1e5c1e874be0c2e98c317ed5e5..14264e69bbfaa14f651458d82dd4c84aae9f0485 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -367,6 +367,12 @@
+@@ -367,6 +367,12 @@ config AX88796_93CX6

        help
          Select this if your platform comes with an external 93CX6 eeprom.
  
        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
        depends on PPC_PMAC && PPC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -194,6 +194,7 @@
+@@ -194,6 +194,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
  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.26/135-ar2313_2.6.26.patch b/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch
index 97d3f1c3878b49d91e9ca174fe155d94750d7a44..a39b46c0b881d8d2896a66598a888e24cb92fb6e 100644 (file)
--- 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,6 +1,6 @@
 --- a/drivers/net/ar2313/ar2313.c
 +++ b/drivers/net/ar2313/ar2313.c
 --- 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";
        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.26/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch
index 3e89407d0de4e6e3bcc643a687e245c0a0dd00e2..c46a56a50aa51aec973b58ddd43bc365260b2f46 100644 (file)
--- 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
 --- 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
  
        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);
  
        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 */
        }
        if (i == numslots) {
                /* Didn't find it */

diff --git a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
index a2b949db9f17c04e64303d8dd1ceccfe2c8faa8d..97b2ddf6b641b3785d512ef8146d6b1b7930d2e4 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
+++ b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
@@ -1,6 +1,6 @@
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
 --- a/net/core/dev.c
 +++ b/net/core/dev.c

-@@ -3786,8 +3786,8 @@
+@@ -3786,8 +3786,8 @@ int register_netdevice(struct net_device

        /* Fix illegal SG+CSUM combinations. */
        if ((dev->features & NETIF_F_SG) &&
            !(dev->features & NETIF_F_ALL_CSUM)) {
        /* 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;
        }
  
                dev->features &= ~NETIF_F_SG;
        }
  

-@@ -3800,9 +3800,9 @@
+@@ -3800,9 +3800,9 @@ int register_netdevice(struct net_device

        }
        if (dev->features & NETIF_F_UFO) {
                if (!(dev->features & NETIF_F_HW_CSUM)) {
        }
        if (dev->features & NETIF_F_UFO) {
                if (!(dev->features & NETIF_F_HW_CSUM)) {

diff --git a/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch b/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch
index f60325ee2f70a2c4f695770ffb79722cd355371b..fb0f2cc3b32943cd9e394c0189d0542e618ef1a4 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch
+++ b/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/kernel/cevt-r4k.c
 +++ b/arch/mips/kernel/cevt-r4k.c
 --- a/arch/mips/kernel/cevt-r4k.c
 +++ b/arch/mips/kernel/cevt-r4k.c

-@@ -205,6 +205,7 @@
+@@ -205,6 +205,7 @@ static int c0_compare_int_usable(void)

        while ((int)(read_c0_count() - cnt) <= 0)
                ;       /* Wait for expiry  */
  
        while ((int)(read_c0_count() - cnt) <= 0)
                ;       /* Wait for expiry  */
  

diff --git a/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
index f628bff577e072cc799ca1684592e1a050ef85f5..46640babffc7b0759ebc7edc1e39f3a2bd0d2589 100644 (file)
--- a/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
+++ b/target/linux/atheros/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);
  
  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;
         */
        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
                        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);
  #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
  {
 --- a/arch/mips/atheros/board.c
 +++ b/arch/mips/atheros/board.c

-@@ -205,6 +205,11 @@
+@@ -265,6 +265,11 @@ void (*board_time_init)(void);

  void __init plat_time_init(void) {
      board_time_init();
  }
  void __init plat_time_init(void) {
      board_time_init();
  }

diff --git a/target/linux/generic-2.6/patches-2.6.26/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.26/001-squashfs.patch
index ab854bba4ba896c903c5cc840212c6d647df8408..f82f4ee3e6dc4b9bdb329b404f49deb86f2ba778 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/001-squashfs.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/001-squashfs.patch
@@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 --- a/fs/Kconfig
 +++ b/fs/Kconfig

-@@ -1395,6 +1395,71 @@
+@@ -1395,6 +1395,71 @@ config CRAMFS

  
          If unsure, say N.
  
  
          If unsure, say N.
  


@@ -74,7 +74,7 @@
        depends on BLOCK
 --- a/fs/Makefile
 +++ b/fs/Makefile
        depends on BLOCK
 --- a/fs/Makefile
 +++ b/fs/Makefile

-@@ -73,6 +73,7 @@
+@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD)            += jbd/

  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_CRAMFS)          += cramfs/
  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_CRAMFS)          += cramfs/


@@ -4128,7 +4128,7 @@
  #include <linux/initrd.h>
  #include <linux/string.h>
  
  #include <linux/initrd.h>
  #include <linux/string.h>
  

-@@ -39,6 +40,7 @@
+@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in

   * numbers could not be found.
   *
   * We currently check for the following magic numbers:
   * numbers could not be found.
   *
   * We currently check for the following magic numbers:


@@ -4136,7 +4136,7 @@
   *    minix
   *    ext2
   *    romfs
   *    minix
   *    ext2
   *    romfs

-@@ -53,6 +55,7 @@
+@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start

        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;
        struct ext2_super_block *ext2sb;
        struct romfs_super_block *romfsb;
        struct cramfs_super *cramfsb;


@@ -4144,7 +4144,7 @@
        int nblocks = -1;
        unsigned char *buf;
  
        int nblocks = -1;
        unsigned char *buf;
  

-@@ -64,6 +67,7 @@
+@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start

        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;
        ext2sb = (struct ext2_super_block *) buf;
        romfsb = (struct romfs_super_block *) buf;
        cramfsb = (struct cramfs_super *) buf;


@@ -4152,7 +4152,7 @@
        memset(buf, 0xe5, size);
  
        /*
        memset(buf, 0xe5, size);
  
        /*

-@@ -101,6 +105,15 @@
+@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start

                goto done;
        }
  
                goto done;
        }
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.26/002-lzma_decompress.patch
index fdc30398631adbbebb9f27b63483a931cb362a74..939e0a9e3221bbc675fb24ab4a623569910b8775 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/002-lzma_decompress.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/002-lzma_decompress.patch
@@ -769,7 +769,7 @@
 +}
 --- a/lib/Makefile
 +++ b/lib/Makefile
 +}
 --- a/lib/Makefile
 +++ b/lib/Makefile

-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o

  lib-y += kobject.o kref.o klist.o
  
  obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
  lib-y += kobject.o kref.o klist.o
  
  obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \

diff --git a/target/linux/generic-2.6/patches-2.6.26/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.26/003-squashfs_lzma.patch
index 16cc87319960209b29c1c0b05f5c4e0a5e30c797..9050e370ca5c0f905a1688b2e4253235713c79a3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/003-squashfs_lzma.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/003-squashfs_lzma.patch
@@ -38,7 +38,7 @@
  static void squashfs_put_super(struct super_block *);
  static int squashfs_statfs(struct dentry *, struct kstatfs *);
  static int squashfs_symlink_readpage(struct file *file, struct page *page);
  static void squashfs_put_super(struct super_block *);
  static int squashfs_statfs(struct dentry *, struct kstatfs *);
  static int squashfs_symlink_readpage(struct file *file, struct page *page);

-@@ -64,7 +81,11 @@
+@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s

                        const char *, void *, struct vfsmount *);
  
  
                        const char *, void *, struct vfsmount *);
  
  


@@ -50,7 +50,7 @@
  
  static struct file_system_type squashfs_fs_type = {
        .owner = THIS_MODULE,
  
  static struct file_system_type squashfs_fs_type = {
        .owner = THIS_MODULE,

-@@ -249,6 +270,15 @@
+@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d

        if (compressed) {
                int zlib_err;
  
        if (compressed) {
                int zlib_err;
  


@@ -66,7 +66,7 @@
                stream.next_in = c_buffer;
                stream.avail_in = c_byte;
                stream.next_out = buffer;
                stream.next_in = c_buffer;
                stream.avail_in = c_byte;
                stream.next_out = buffer;

-@@ -263,7 +293,7 @@
+@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d

                        bytes = 0;
                } else
                        bytes = stream.total_out;
                        bytes = 0;
                } else
                        bytes = stream.total_out;


@@ -75,7 +75,7 @@
                up(&msblk->read_data_mutex);
        }
  
                up(&msblk->read_data_mutex);
        }
  

-@@ -2045,15 +2075,19 @@
+@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)

        printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
                "Phillip Lougher\n");
  
        printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
                "Phillip Lougher\n");
  


@@ -95,7 +95,7 @@
                destroy_inodecache();
        }
  
                destroy_inodecache();
        }
  

-@@ -2064,7 +2098,9 @@
+@@ -2064,7 +2098,9 @@ out:

  
  static void __exit exit_squashfs_fs(void)
  {
  
  static void __exit exit_squashfs_fs(void)
  {

diff --git a/target/linux/generic-2.6/patches-2.6.26/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.26/004-extra_optimization.patch
index 6dc316e6fbbe5995cc2f6585b19f94374ae6f5c0..723bd06b919e7b665af749b2047d48f6f8be3ee2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/004-extra_optimization.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -537,6 +537,9 @@
+@@ -537,6 +537,9 @@ endif

  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
  
  NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS     += $(NOSTDINC_FLAGS)
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/005-squashfs_fix.patch b/target/linux/generic-2.6/patches-2.6.26/005-squashfs_fix.patch
index 961829e580505bdf52fe7017f921a9ced123dd98..56b7fc2c406dae588f56bb70ed0f6fca2e9c9e7b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/005-squashfs_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/005-squashfs_fix.patch
@@ -8,7 +8,7 @@
  #include <linux/squashfs_fs_sb.h>
  #include <linux/squashfs_fs_i.h>
  #include <linux/buffer_head.h>
  #include <linux/squashfs_fs_sb.h>
  #include <linux/squashfs_fs_i.h>
  #include <linux/buffer_head.h>

-@@ -2125,7 +2126,7 @@
+@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc

  }
  
  
  }
  
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.26/006-gcc4_inline_fix.patch
index dbb7e7c87e3dd546a9e1c3be196a077e8433605c..cd62e9c2501974bf9245319ede3dd43ae96878a4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/006-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/006-gcc4_inline_fix.patch
@@ -1,6 +1,6 @@
 --- a/include/asm-mips/system.h
 +++ b/include/asm-mips/system.h
 --- a/include/asm-mips/system.h
 +++ b/include/asm-mips/system.h

-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3

     if something tries to do an invalid xchg().  */
  extern void __xchg_called_with_bad_pointer(void);
  
     if something tries to do an invalid xchg().  */
  extern void __xchg_called_with_bad_pointer(void);
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.26/007-samsung_flash.patch
index 71e47a55c8caa3e648fcffd8a16d4b45cdd91288..d55192a8b8174c3ca784e8e6dc27c1d78ce166bb 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/007-samsung_flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/007-samsung_flash.patch
@@ -8,7 +8,7 @@
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

-@@ -324,12 +325,19 @@
+@@ -324,12 +325,19 @@ struct mtd_info *cfi_cmdset_0002(struct 

  
                if (extp->MajorVersion != '1' ||
                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
  
                if (extp->MajorVersion != '1' ||
                    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

diff --git a/target/linux/generic-2.6/patches-2.6.26/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.26/009-revert_intel_flash_breakage.patch
index 21c2bde58cfb8d668ea2386479ecfde67798e1b3..bb8daa0339ae3f444e82e39682709e8897e7eb57 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/009-revert_intel_flash_breakage.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0001.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0001.c
 --- a/drivers/mtd/chips/cfi_cmdset_0001.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0001.c

-@@ -1010,7 +1010,7 @@
+@@ -1010,7 +1010,7 @@ static void __xipram xip_enable(struct m

  
  static int __xipram xip_wait_for_operation(
                struct map_info *map, struct flchip *chip,
  
  static int __xipram xip_wait_for_operation(
                struct map_info *map, struct flchip *chip,


@@ -9,7 +9,7 @@
  {
        struct cfi_private *cfi = map->fldrv_priv;
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  {
        struct cfi_private *cfi = map->fldrv_priv;
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;

-@@ -1019,7 +1019,7 @@
+@@ -1019,7 +1019,7 @@ static int __xipram xip_wait_for_operati

        flstate_t oldstate, newstate;
  
                start = xip_currtime();
        flstate_t oldstate, newstate;
  
                start = xip_currtime();


@@ -18,7 +18,7 @@
        if (usec == 0)
                usec = 500000;
        done = 0;
        if (usec == 0)
                usec = 500000;
        done = 0;

-@@ -1129,8 +1129,8 @@
+@@ -1129,8 +1129,8 @@ static int __xipram xip_wait_for_operati

  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
        INVALIDATE_CACHED_RANGE(map, from, size)
  
  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
        INVALIDATE_CACHED_RANGE(map, from, size)
  


@@ -29,7 +29,7 @@
  
  #else
  
  
  #else
  

-@@ -1142,65 +1142,65 @@
+@@ -1142,65 +1142,65 @@ static int __xipram xip_wait_for_operati

  static int inval_cache_and_wait_for_operation(
                struct map_info *map, struct flchip *chip,
                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
  static int inval_cache_and_wait_for_operation(
                struct map_info *map, struct flchip *chip,
                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,


@@ -130,7 +130,7 @@
        /* Done and happy. */
        chip->state = FL_STATUS;
        return 0;
        /* Done and happy. */
        chip->state = FL_STATUS;
        return 0;

-@@ -1209,7 +1209,8 @@
+@@ -1209,7 +1209,8 @@ static int inval_cache_and_wait_for_oper

  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \
  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \


@@ -140,7 +140,7 @@
  
  
  static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
  
  
  static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)

-@@ -1443,7 +1444,7 @@
+@@ -1443,7 +1444,7 @@ static int __xipram do_write_oneword(str

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, map_bankwidth(map),
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, map_bankwidth(map),


@@ -149,7 +149,7 @@
        if (ret) {
                xip_enable(map, chip, adr);
                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
        if (ret) {
                xip_enable(map, chip, adr);
                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);

-@@ -1683,7 +1684,7 @@
+@@ -1683,7 +1684,7 @@ static int __xipram do_write_buffer(stru

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
                                   initial_adr, initial_len,
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
                                   initial_adr, initial_len,


@@ -158,7 +158,7 @@
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
                chip->state = FL_STATUS;
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
                chip->state = FL_STATUS;

-@@ -1818,7 +1819,7 @@
+@@ -1818,7 +1819,7 @@ static int __xipram do_erase_oneblock(st

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, len,
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, len,

diff --git a/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch
index 6fb0be1010475eb495a8f2f3f867d11b531bcf91..4f046b469b6e8b6720d69509c63b7fe04c7e4282 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/060-block2mtd_init.patch
@@ -8,7 +8,7 @@
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>
  #include <linux/buffer_head.h>
  #include <linux/mutex.h>
  #include <linux/mount.h>

-@@ -237,10 +238,11 @@
+@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct

  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */


@@ -21,7 +21,7 @@
  
        if (!devname)
                return NULL;
  
        if (!devname)
                return NULL;

-@@ -279,14 +281,18 @@
+@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(

  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */


@@ -44,7 +44,7 @@
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;

-@@ -299,14 +305,17 @@
+@@ -299,14 +305,17 @@ static struct block2mtd_dev *add_device(

        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
  
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
  


@@ -65,7 +65,7 @@
        return dev;
  
  devinit_err:
        return dev;
  
  devinit_err:

-@@ -379,9 +388,9 @@
+@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]

  
  static int block2mtd_setup2(const char *val)
  {
  
  static int block2mtd_setup2(const char *val)
  {


@@ -77,7 +77,7 @@
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;

-@@ -392,7 +401,7 @@
+@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *

        strcpy(str, val);
        kill_final_newline(str);
  
        strcpy(str, val);
        kill_final_newline(str);
  


@@ -86,7 +86,7 @@
                token[i] = strsep(&str, ",");
  
        if (str)
                token[i] = strsep(&str, ",");
  
        if (str)

-@@ -411,8 +420,10 @@
+@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *

                        parse_err("illegal erase size");
                }
        }
                        parse_err("illegal erase size");
                }
        }


@@ -98,7 +98,7 @@
  
        return 0;
  }
  
        return 0;
  }

-@@ -446,7 +457,7 @@
+@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v

  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
  
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);

diff --git a/target/linux/generic-2.6/patches-2.6.26/065-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.26/065-rootfs_split.patch
index c619cdad267ba0db2e43a9d1922566980a15c961..2c0c4c40daa6f9790326621f0f0c76b1d3c461b2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/065-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/065-rootfs_split.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig

-@@ -47,6 +47,16 @@
+@@ -47,6 +47,16 @@ config MTD_PARTITIONS

          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
  
          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
  


@@ -28,7 +28,7 @@
  
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);
  
  /* Our partition linked list */
  static LIST_HEAD(mtd_partitions);

-@@ -39,7 +41,7 @@
+@@ -39,7 +41,7 @@ struct mtd_part {

   * the pointer to that structure with this macro.
   */
  #define PART(x)  ((struct mtd_part *)(x))
   * the pointer to that structure with this macro.
   */
  #define PART(x)  ((struct mtd_part *)(x))


@@ -37,7 +37,7 @@
  
  /*
   * MTD methods which simply translate the effective address and pass through
  
  /*
   * MTD methods which simply translate the effective address and pass through

-@@ -322,6 +324,316 @@
+@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *

        return 0;
  }
  
        return 0;
  }
  


@@ -354,7 +354,7 @@
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to

-@@ -334,171 +646,31 @@
+@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *

                       int nbparts)
  {
        struct mtd_part *slave;
                       int nbparts)
  {
        struct mtd_part *slave;


@@ -547,7 +547,7 @@
                }
        }
  
                }
        }
  

-@@ -574,6 +746,32 @@
+@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info

        return ret;
  }
  
        return ret;
  }
  


@@ -582,7 +582,7 @@
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c
  EXPORT_SYMBOL_GPL(deregister_mtd_parser);
 --- a/drivers/mtd/devices/block2mtd.c
 +++ b/drivers/mtd/devices/block2mtd.c

-@@ -34,6 +34,8 @@
+@@ -34,6 +34,8 @@ struct block2mtd_dev {

        struct block_device *blkdev;
        struct mtd_info mtd;
        struct mutex write_mutex;
        struct block_device *blkdev;
        struct mtd_info mtd;
        struct mutex write_mutex;


@@ -591,7 +591,7 @@
  };
  
  
  };
  
  

-@@ -86,6 +88,12 @@
+@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in

        size_t len = instr->len;
        int err;
  
        size_t len = instr->len;
        int err;
  


@@ -604,7 +604,7 @@
        instr->state = MTD_ERASING;
        mutex_lock(&dev->write_mutex);
        err = _block2mtd_erase(dev, from, len);
        instr->state = MTD_ERASING;
        mutex_lock(&dev->write_mutex);
        err = _block2mtd_erase(dev, from, len);

-@@ -98,6 +106,10 @@
+@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in

  
        instr->state = MTD_ERASE_DONE;
        mtd_erase_callback(instr);
  
        instr->state = MTD_ERASE_DONE;
        mtd_erase_callback(instr);


@@ -615,7 +615,7 @@
        return err;
  }
  
        return err;
  }
  

-@@ -109,10 +121,14 @@
+@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf

        struct page *page;
        int index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);
        struct page *page;
        int index = from >> PAGE_SHIFT;
        int offset = from & (PAGE_SIZE-1);


@@ -633,7 +633,7 @@
        if (from + len > mtd->size)
                len = mtd->size - from;
  
        if (from + len > mtd->size)
                len = mtd->size - from;
  

-@@ -127,10 +143,14 @@
+@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf

                len = len - cpylen;
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
                len = len - cpylen;
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);


@@ -652,7 +652,7 @@
  
                memcpy(buf, page_address(page) + offset, cpylen);
                page_cache_release(page);
  
                memcpy(buf, page_address(page) + offset, cpylen);
                page_cache_release(page);

-@@ -141,7 +161,10 @@
+@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf

                offset = 0;
                index++;
        }
                offset = 0;
                index++;
        }


@@ -664,7 +664,7 @@
  }
  
  
  }
  
  

-@@ -193,12 +216,22 @@
+@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in

                size_t *retlen, const u_char *buf)
  {
        struct block2mtd_dev *dev = mtd->priv;
                size_t *retlen, const u_char *buf)
  {
        struct block2mtd_dev *dev = mtd->priv;


@@ -691,7 +691,7 @@
        if (to + len > mtd->size)
                len = mtd->size - to;
  
        if (to + len > mtd->size)
                len = mtd->size - to;
  

-@@ -207,6 +240,9 @@
+@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in

        mutex_unlock(&dev->write_mutex);
        if (err > 0)
                err = 0;
        mutex_unlock(&dev->write_mutex);
        if (err > 0)
                err = 0;


@@ -701,7 +701,7 @@
        return err;
  }
  
        return err;
  }
  

-@@ -215,51 +251,29 @@
+@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in

  static void block2mtd_sync(struct mtd_info *mtd)
  {
        struct block2mtd_dev *dev = mtd->priv;
  static void block2mtd_sync(struct mtd_info *mtd)
  {
        struct block2mtd_dev *dev = mtd->priv;


@@ -761,7 +761,7 @@
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
                }
                if (devt) {
                        bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
                }

-@@ -267,17 +281,96 @@
+@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(

  #endif
  
        if (IS_ERR(bdev)) {
  #endif
  
        if (IS_ERR(bdev)) {


@@ -861,7 +861,7 @@
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */

-@@ -304,6 +397,7 @@
+@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(

        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
        dev->mtd.read = block2mtd_read;
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;


@@ -879,7 +879,7 @@
  
  #include <asm/uaccess.h>
  
  
  #include <asm/uaccess.h>
  

-@@ -756,6 +757,13 @@
+@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode

                file->f_pos = 0;
                break;
        }
                file->f_pos = 0;
                break;
        }


@@ -895,7 +895,7 @@
                ret = -ENOTTY;
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h
                ret = -ENOTTY;
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h

-@@ -98,6 +98,7 @@
+@@ -98,6 +98,7 @@ struct mtd_oob_ops {

        uint8_t         *oobbuf;
  };
  
        uint8_t         *oobbuf;
  };
  


@@ -903,7 +903,7 @@
  struct mtd_info {
        u_char type;
        u_int32_t flags;
  struct mtd_info {
        u_char type;
        u_int32_t flags;

-@@ -213,6 +214,9 @@
+@@ -213,6 +214,9 @@ struct mtd_info {

        struct module *owner;
        int usecount;
  
        struct module *owner;
        int usecount;
  


@@ -923,7 +923,7 @@
  struct mtd_partition {
        char *name;                     /* identifier string */
        u_int32_t size;                 /* partition size */
  struct mtd_partition {
        char *name;                     /* identifier string */
        u_int32_t size;                 /* partition size */

-@@ -43,6 +44,7 @@
+@@ -43,6 +44,7 @@ struct mtd_partition {

        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
        struct mtd_info **mtdp;         /* pointer to store the MTD object */
        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
        struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
        struct mtd_info **mtdp;         /* pointer to store the MTD object */


@@ -931,7 +931,7 @@
  };
  
  #define MTDPART_OFS_NXTBLK    (-2)
  };
  
  #define MTDPART_OFS_NXTBLK    (-2)

-@@ -52,6 +54,7 @@
+@@ -52,6 +54,7 @@ struct mtd_partition {

  
  int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
  int del_mtd_partitions(struct mtd_info *);
  
  int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
  int del_mtd_partitions(struct mtd_info *);


@@ -941,7 +941,7 @@
   * Functions dealing with the various ways of partitioning the space
 --- a/include/mtd/mtd-abi.h
 +++ b/include/mtd/mtd-abi.h
   * Functions dealing with the various ways of partitioning the space
 --- a/include/mtd/mtd-abi.h
 +++ b/include/mtd/mtd-abi.h

-@@ -95,6 +95,7 @@
+@@ -95,6 +95,7 @@ struct otp_info {

  #define ECCGETLAYOUT          _IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS           _IOR('M', 18, struct mtd_ecc_stats)
  #define MTDFILEMODE           _IO('M', 19)
  #define ECCGETLAYOUT          _IOR('M', 17, struct nand_ecclayout)
  #define ECCGETSTATS           _IOR('M', 18, struct mtd_ecc_stats)
  #define MTDFILEMODE           _IO('M', 19)

diff --git a/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
index 0f15bab3dd707b4675da1659252c756a21bef39c..784fba1b703fdc7f1fae8d977e39b787623e7818 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c
 --- a/drivers/mtd/redboot.c
 +++ b/drivers/mtd/redboot.c

-@@ -251,14 +251,21 @@
+@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru

  #endif
                names += strlen(names)+1;
  
  #endif
                names += strlen(names)+1;
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch
index 07f569a731b35cf18158fdc7221688980faa32b3..1d6507997665b23b5fe2dabf94538ed6f457c2f5 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch
@@ -9,7 +9,7 @@
  struct fis_image_desc {
      unsigned char name[16];      // Null terminated name
      uint32_t    flash_base;    // Address within FLASH of image
  struct fis_image_desc {
      unsigned char name[16];      // Null terminated name
      uint32_t    flash_base;    // Address within FLASH of image

-@@ -43,6 +45,7 @@
+@@ -43,6 +45,7 @@ static int parse_redboot_partitions(stru

                               struct mtd_partition **pparts,
                               unsigned long fis_origin)
  {
                               struct mtd_partition **pparts,
                               unsigned long fis_origin)
  {


@@ -17,7 +17,7 @@
        int nrparts = 0;
        struct fis_image_desc *buf;
        struct mtd_partition *parts;
        int nrparts = 0;
        struct fis_image_desc *buf;
        struct mtd_partition *parts;

-@@ -211,14 +214,14 @@
+@@ -211,14 +214,14 @@ static int parse_redboot_partitions(stru

                }
        }
  #endif
                }
        }
  #endif


@@ -34,7 +34,7 @@
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        if (nulllen > 0) {
                strcpy(nullname, nullstring);
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        if (nulllen > 0) {
                strcpy(nullname, nullstring);

-@@ -237,6 +240,8 @@
+@@ -237,6 +240,8 @@ static int parse_redboot_partitions(stru

        }
  #endif
        for ( ; i<nrparts; i++) {
        }
  #endif
        for ( ; i<nrparts; i++) {


@@ -43,7 +43,7 @@
                parts[i].size = fl->img->size;
                parts[i].offset = fl->img->flash_base;
                parts[i].name = names;
                parts[i].size = fl->img->size;
                parts[i].offset = fl->img->flash_base;
                parts[i].name = names;

-@@ -270,6 +275,14 @@
+@@ -270,6 +275,14 @@ static int parse_redboot_partitions(stru

                fl = fl->next;
                kfree(tmp_fl);
        }
                fl = fl->next;
                kfree(tmp_fl);
        }

diff --git a/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch
index a263093c0e0f0b8b5e7df789bac9f9efdb99eaed..3440004e41553ba620580eecd44c4d2806b193b6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h

-@@ -573,6 +573,7 @@
+@@ -573,6 +573,7 @@ struct platform_nand_chip {

        int                     chip_delay;
        unsigned int            options;
        const char              **part_probe_types;
        int                     chip_delay;
        unsigned int            options;
        const char              **part_probe_types;


@@ -10,7 +10,7 @@
  
 --- a/drivers/mtd/nand/plat_nand.c
 +++ b/drivers/mtd/nand/plat_nand.c
  
 --- a/drivers/mtd/nand/plat_nand.c
 +++ b/drivers/mtd/nand/plat_nand.c

-@@ -71,7 +71,18 @@
+@@ -71,7 +71,18 @@ static int __init plat_nand_probe(struct

        platform_set_drvdata(pdev, data);
  
        /* Scan to find existance of the device */
        platform_set_drvdata(pdev, data);
  
        /* Scan to find existance of the device */

diff --git a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
index 58ebdc53299e1b49717c884858897947960f44a6..5599537ea51df420cf43dda7f08da55bbba15510 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -749,6 +749,27 @@
+@@ -749,6 +749,27 @@ config NETFILTER_XT_MATCH_STATE

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -30,7 +30,7 @@
        depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -78,6 +78,7 @@
+@@ -78,6 +78,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)

  obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o


@@ -2027,7 +2027,7 @@
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
 +}
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c

-@@ -205,6 +205,14 @@
+@@ -205,6 +205,14 @@ destroy_conntrack(struct nf_conntrack *n

         * too. */
        nf_ct_remove_expectations(ct);
  
         * too. */
        nf_ct_remove_expectations(ct);
  


@@ -2044,7 +2044,7 @@
                BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
                BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c

-@@ -174,7 +174,12 @@
+@@ -174,7 +174,12 @@ static int ct_seq_show(struct seq_file *

                return -ENOSPC;
  #endif
  
                return -ENOSPC;
  #endif
  


@@ -2060,7 +2060,7 @@
        return 0;
 --- a/include/net/netfilter/nf_conntrack.h
 +++ b/include/net/netfilter/nf_conntrack.h
        return 0;
 --- a/include/net/netfilter/nf_conntrack.h
 +++ b/include/net/netfilter/nf_conntrack.h

-@@ -124,6 +124,22 @@
+@@ -124,6 +124,22 @@ struct nf_conn

        u_int32_t secmark;
  #endif
  
        u_int32_t secmark;
  #endif
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch
index dff6d188aaf7d0eeea1f9075833f1c42e1d9d315..ad0fdb823fbe62d1686666959e75d452e1823d8a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/101-netfilter_layer7_pktmatch.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/netfilter/xt_layer7.h
 +++ b/include/linux/netfilter/xt_layer7.h
 --- a/include/linux/netfilter/xt_layer7.h
 +++ b/include/linux/netfilter/xt_layer7.h

-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ struct xt_layer7_info {

      char protocol[MAX_PROTOCOL_LEN];
      char pattern[MAX_PATTERN_LEN];
      u_int8_t invert;
      char protocol[MAX_PROTOCOL_LEN];
      char pattern[MAX_PATTERN_LEN];
      u_int8_t invert;


@@ -10,7 +10,7 @@
  #endif /* _XT_LAYER7_H */
 --- a/net/netfilter/xt_layer7.c
 +++ b/net/netfilter/xt_layer7.c
  #endif /* _XT_LAYER7_H */
 --- a/net/netfilter/xt_layer7.c
 +++ b/net/netfilter/xt_layer7.c

-@@ -297,34 +297,36 @@
+@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con

  }
  
  /* add the new app data to the conntrack.  Return number of bytes added. */
  }
  
  /* add the new app data to the conntrack.  Return number of bytes added. */


@@ -60,7 +60,7 @@
        return length;
  }
  
        return length;
  }
  

-@@ -411,7 +413,7 @@
+@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin,

        const struct xt_layer7_info * info = matchinfo;
        enum ip_conntrack_info master_ctinfo, ctinfo;
        struct nf_conn *master_conntrack, *conntrack;
        const struct xt_layer7_info * info = matchinfo;
        enum ip_conntrack_info master_ctinfo, ctinfo;
        struct nf_conn *master_conntrack, *conntrack;


@@ -69,7 +69,7 @@
        unsigned int pattern_result, appdatalen;
        regexp * comppattern;
  
        unsigned int pattern_result, appdatalen;
        regexp * comppattern;
  

-@@ -439,8 +441,8 @@
+@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin,

                master_conntrack = master_ct(master_conntrack);
  
        /* if we've classified it or seen too many packets */
                master_conntrack = master_ct(master_conntrack);
  
        /* if we've classified it or seen too many packets */


@@ -80,7 +80,7 @@
  
                pattern_result = match_no_append(conntrack, master_conntrack,
                                                 ctinfo, master_ctinfo, info);
  
                pattern_result = match_no_append(conntrack, master_conntrack,
                                                 ctinfo, master_ctinfo, info);

-@@ -473,6 +475,25 @@
+@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin,

        /* the return value gets checked later, when we're ready to use it */
        comppattern = compile_and_cache(info->pattern, info->protocol);
  
        /* the return value gets checked later, when we're ready to use it */
        comppattern = compile_and_cache(info->pattern, info->protocol);
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.26/110-ipp2p_0.8.1rc1.patch
index 053f1c7e13102ddd016b02a72d33bd9cf92b3fff..6b01fac4fdb0ecf2a6d8c0d5047530e029908063 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/110-ipp2p_0.8.1rc1.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/110-ipp2p_0.8.1rc1.patch
@@ -893,7 +893,7 @@
 +
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
 +
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -57,6 +57,12 @@
+@@ -57,6 +57,12 @@ config IP_NF_IPTABLES

          To compile it as a module, choose M here.  If unsure, say N.
  
  # The matches.
          To compile it as a module, choose M here.  If unsure, say N.
  
  # The matches.


@@ -908,7 +908,7 @@
        depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
        depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -50,6 +50,8 @@
+@@ -50,6 +50,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn

  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
index 31e62e250faa275ef6bf97bcbe416f0401c44492..5f5ef6843a408dea6c1d9535f76a34f96a5dc6f7 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch
@@ -7517,7 +7517,7 @@
 +module_exit(ipt_SET_fini);
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
 +module_exit(ipt_SET_fini);
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -401,5 +401,122 @@
+@@ -401,5 +401,122 @@ config IP_NF_ARP_MANGLE

          Allows altering the ARP packet payload: source and destination
          hardware and network addresses.
  
          Allows altering the ARP packet payload: source and destination
          hardware and network addresses.
  


@@ -7642,7 +7642,7 @@
  
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
  
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -49,6 +49,7 @@
+@@ -49,6 +49,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o

  obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o


@@ -7650,7 +7650,7 @@
  
  obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
  
  
  obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
  

-@@ -62,6 +63,18 @@
+@@ -62,6 +63,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i

  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
  obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.26/140-netfilter_time.patch
index 821c0cef5724cdb1d055bf72e6c0567a3e32af44..ef8c9b17fb85467c0bc36f87bba3631aae6eabdc 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/140-netfilter_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/140-netfilter_time.patch
@@ -204,7 +204,7 @@
 +}
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
 +}
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -63,6 +63,22 @@
+@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P

        help
          Module for matching traffic of various Peer-to-Peer applications
  
        help
          Module for matching traffic of various Peer-to-Peer applications
  


@@ -229,7 +229,7 @@
        depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
        depends on IP_NF_IPTABLES
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -50,6 +50,7 @@
+@@ -50,6 +50,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn

  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
index d43baf01db026114b0138b2f72926b8d790498f0..c85e811609f4de46f60c7846fa5f2be56e9f398d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch
@@ -477,7 +477,7 @@
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -117,6 +117,129 @@
+@@ -117,6 +117,129 @@ config EQUALIZER

          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  
          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  


@@ -609,7 +609,7 @@
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -142,6 +142,7 @@
+@@ -142,6 +142,7 @@ obj-$(CONFIG_SLHC) += slhc.o

  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o
  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o


@@ -653,7 +653,7 @@
 +#endif /* _IP6T_IMQ_H */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 +#endif /* _IP6T_IMQ_H */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h

-@@ -300,6 +300,10 @@
+@@ -300,6 +300,10 @@ struct sk_buff {

        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif
        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif


@@ -664,7 +664,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif

-@@ -1633,6 +1637,10 @@
+@@ -1633,6 +1637,10 @@ static inline void __nf_copy(struct sk_b

        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif


@@ -687,7 +687,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>

-@@ -1569,7 +1572,11 @@
+@@ -1569,7 +1572,11 @@ static int dev_gso_segment(struct sk_buf

  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        if (likely(!skb->next)) {
  int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
  {
        if (likely(!skb->next)) {


@@ -774,7 +774,7 @@
 +MODULE_LICENSE("GPL");
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
 +MODULE_LICENSE("GPL");
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -145,6 +145,17 @@
+@@ -145,6 +145,17 @@ config IP_NF_FILTER

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -794,7 +794,7 @@
        depends on IP_NF_FILTER
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
        depends on IP_NF_FILTER
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i

  obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
  obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
  obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
  obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o


@@ -876,7 +876,7 @@
 +MODULE_LICENSE("GPL");
 --- a/net/ipv6/netfilter/Kconfig
 +++ b/net/ipv6/netfilter/Kconfig
 +MODULE_LICENSE("GPL");
 --- a/net/ipv6/netfilter/Kconfig
 +++ b/net/ipv6/netfilter/Kconfig

-@@ -179,6 +179,15 @@
+@@ -179,6 +179,15 @@ config IP6_NF_MANGLE

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -904,7 +904,7 @@
  
 --- a/net/sched/sch_generic.c
 +++ b/net/sched/sch_generic.c
  
 --- a/net/sched/sch_generic.c
 +++ b/net/sched/sch_generic.c

-@@ -203,6 +203,7 @@
+@@ -203,6 +203,7 @@ void __qdisc_run(struct net_device *dev)

  
        clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
  }
  
        clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
  }

diff --git a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
index 9c69385dfb549873a7a23c5a26b11b308283b9bb..6357f6df91603657921c39876212db8415c3480f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
@@ -95,7 +95,7 @@
 +#define xt_request_find_match xt_request_find_match_lo
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 +#define xt_request_find_match xt_request_find_match_lo
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -288,6 +288,14 @@
+@@ -288,6 +288,14 @@ config NETFILTER_XTABLES

  
  # alphabetically ordered list of targets
  
  
  # alphabetically ordered list of targets
  


@@ -110,7 +110,7 @@
  config NETFILTER_XT_TARGET_CLASSIFY
        tristate '"CLASSIFY" target support'
        depends on NETFILTER_XTABLES
  config NETFILTER_XT_TARGET_CLASSIFY
        tristate '"CLASSIFY" target support'
        depends on NETFILTER_XTABLES

-@@ -317,6 +325,14 @@
+@@ -317,6 +325,14 @@ config NETFILTER_XT_TARGET_CONNMARK

          <file:Documentation/kbuild/modules.txt>.  The module will be called
          ipt_CONNMARK.ko.  If unsure, say `N'.
  
          <file:Documentation/kbuild/modules.txt>.  The module will be called
          ipt_CONNMARK.ko.  If unsure, say `N'.
  


@@ -125,7 +125,7 @@
  config NETFILTER_XT_TARGET_DSCP
        tristate '"DSCP" and "TOS" target support'
        depends on NETFILTER_XTABLES
  config NETFILTER_XT_TARGET_DSCP
        tristate '"DSCP" and "TOS" target support'
        depends on NETFILTER_XTABLES

-@@ -653,6 +669,14 @@
+@@ -653,6 +669,14 @@ config NETFILTER_XT_MATCH_POLICY

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -142,7 +142,7 @@
        depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -51,6 +51,8 @@
+@@ -51,6 +51,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK

  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o


@@ -151,7 +151,7 @@
  
  # matches
  obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
  
  # matches
  obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o

-@@ -84,3 +86,4 @@
+@@ -84,3 +86,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) 

  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o


@@ -833,7 +833,7 @@
 +MODULE_ALIAS("ipt_portscan");
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
 +MODULE_ALIAS("ipt_portscan");
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c

-@@ -1554,6 +1554,8 @@
+@@ -1554,6 +1554,8 @@ __u32 secure_tcp_sequence_number(__be32 

        return seq;
  }
  
        return seq;
  }
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.26/171-netfilter_tarpit.patch
index 24b334efe8f3f7eee586861d3c00d6ef940372e6..6bddb5b8cd97e082a8e0407eb155ad438d505f7e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/171-netfilter_tarpit.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/171-netfilter_tarpit.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -449,6 +449,23 @@
+@@ -449,6 +449,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -26,7 +26,7 @@
        depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -48,6 +48,7 @@
+@@ -48,6 +48,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE

  obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.26/180-netfilter_depends.patch
index 63c81b273eee79aad341e19e0c1594e18d5d4563..e63dd7b331c5dd9c8e32c7082dd2f914ee86f0aa 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ config NF_CONNTRACK_FTP

  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"


@@ -9,7 +9,7 @@
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most

-@@ -468,7 +468,7 @@
+@@ -468,7 +468,7 @@ config NETFILTER_XT_TARGET_TARPIT

  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'

diff --git a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
index 0b2965a947768eaba3081b1a5e1f847aacf7c165..505d0d1db526dc1e61891f3f9dcebb02acda11e3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
@@ -294,7 +294,7 @@
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am

  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o


@@ -304,7 +304,7 @@
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -270,6 +270,16 @@
+@@ -270,6 +270,16 @@ config NF_CONNTRACK_TFTP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -323,7 +323,7 @@
        depends on NF_CONNTRACK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NF_CONNTRACK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co

  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o


@@ -333,7 +333,7 @@
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -304,6 +304,11 @@
+@@ -304,6 +304,11 @@ config NF_NAT_IRC

        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  
        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch
index 4a336a95969ac526bdd4bfd7de8da68e51dfb506..1c8666a6434bf692bd8287efc9b76f716f759a20 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/200-sched_esfq.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/pkt_sched.h
 +++ b/include/linux/pkt_sched.h
 --- a/include/linux/pkt_sched.h
 +++ b/include/linux/pkt_sched.h

-@@ -162,8 +162,37 @@
+@@ -162,8 +162,37 @@ struct tc_sfq_xstats

   *
   *    The only reason for this is efficiency, it is possible
   *    to change these parameters in compile time.
   *
   *    The only reason for this is efficiency, it is possible
   *    to change these parameters in compile time.


@@ -40,7 +40,7 @@
  enum
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig
  enum
 --- a/net/sched/Kconfig
 +++ b/net/sched/Kconfig

-@@ -128,6 +128,37 @@
+@@ -128,6 +128,37 @@ config NET_SCH_SFQ

          To compile this code as a module, choose M here: the
          module will be called sch_sfq.
  
          To compile this code as a module, choose M here: the
          module will be called sch_sfq.
  


@@ -80,7 +80,7 @@
        ---help---
 --- a/net/sched/Makefile
 +++ b/net/sched/Makefile
        ---help---
 --- a/net/sched/Makefile
 +++ b/net/sched/Makefile

-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED)   += sch_gred.o

  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
  obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o
  obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o 
  obj-$(CONFIG_NET_SCH_DSMARK)  += sch_dsmark.o
  obj-$(CONFIG_NET_SCH_SFQ)     += sch_sfq.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
index 17ef6c6297ec1f49f65b7099fc7ab0dba92242b0..8ac3a7e4dbbed9d124f10c385eec58cff6663528 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/202-mips-freestanding.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile

-@@ -597,6 +597,9 @@
+@@ -597,6 +597,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/

  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  
  cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
  load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
index 17a082d2c2bcd32b450ec1d2893cfcb232965527..16d3e1f8e8fa72edc5c9219402f7d50b6768c163 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/204-jffs2_eofdetect.patch
@@ -1,6 +1,6 @@
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c
 --- a/fs/jffs2/build.c
 +++ b/fs/jffs2/build.c

-@@ -111,6 +111,17 @@
+@@ -111,6 +111,17 @@ static int jffs2_build_filesystem(struct

        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  
        dbg_fsbuild("scanned flash completely\n");
        jffs2_dbg_dump_block_lists_nolock(c);
  


@@ -20,7 +20,7 @@
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c
        /* Now scan the directory tree, increasing nlink according to every dirent found. */
 --- a/fs/jffs2/scan.c
 +++ b/fs/jffs2/scan.c

-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ static int file_dirty(struct jffs2_sb_in

                return ret;
        if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
                return ret;
                return ret;
        if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
                return ret;


@@ -29,7 +29,7 @@
           think it's recoverable now. */
        jeb->dirty_size += jeb->wasted_size;
        c->dirty_size += jeb->wasted_size;
           think it's recoverable now. */
        jeb->dirty_size += jeb->wasted_size;
        c->dirty_size += jeb->wasted_size;

-@@ -144,8 +144,11 @@
+@@ -144,8 +144,11 @@ int jffs2_scan_medium(struct jffs2_sb_in

                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);
  
                /* reset summary info for next eraseblock scan */
                jffs2_sum_reset_collected(s);
  


@@ -43,7 +43,7 @@
  
                if (ret < 0)
                        goto out;
  
                if (ret < 0)
                        goto out;

-@@ -400,7 +403,7 @@
+@@ -400,7 +403,7 @@ static int jffs2_scan_xref_node(struct j

        if (!ref)
                return -ENOMEM;
  
        if (!ref)
                return -ENOMEM;
  


@@ -52,7 +52,7 @@
         * and AFTER xattr_ref is marked as a dead xref,
         * ref->xid is used to store 32bit xid, xd is not used
         * ref->ino is used to store 32bit inode-number, ic is not used
         * and AFTER xattr_ref is marked as a dead xref,
         * ref->xid is used to store 32bit xid, xd is not used
         * ref->ino is used to store 32bit inode-number, ic is not used

-@@ -473,7 +476,7 @@
+@@ -473,7 +476,7 @@ static int jffs2_scan_eraseblock (struct

                struct jffs2_sum_marker *sm;
                void *sumptr = NULL;
                uint32_t sumlen;
                struct jffs2_sum_marker *sm;
                void *sumptr = NULL;
                uint32_t sumlen;


@@ -61,7 +61,7 @@
                if (!buf_size) {
                        /* XIP case. Just look, point at the summary if it's there */
                        sm = (void *)buf + c->sector_size - sizeof(*sm);
                if (!buf_size) {
                        /* XIP case. Just look, point at the summary if it's there */
                        sm = (void *)buf + c->sector_size - sizeof(*sm);

-@@ -489,9 +492,9 @@
+@@ -489,9 +492,9 @@ static int jffs2_scan_eraseblock (struct

                                buf_len = sizeof(*sm);
  
                        /* Read as much as we want into the _end_ of the preallocated buffer */
                                buf_len = sizeof(*sm);
  
                        /* Read as much as we want into the _end_ of the preallocated buffer */


@@ -73,7 +73,7 @@
                        if (err)
                                return err;
  
                        if (err)
                                return err;
  

-@@ -510,9 +513,9 @@
+@@ -510,9 +513,9 @@ static int jffs2_scan_eraseblock (struct

                                }
                                if (buf_len < sumlen) {
                                        /* Need to read more so that the entire summary node is present */
                                }
                                if (buf_len < sumlen) {
                                        /* Need to read more so that the entire summary node is present */


@@ -85,7 +85,7 @@
                                        if (err)
                                                return err;
                                }
                                        if (err)
                                                return err;
                                }

-@@ -525,7 +528,7 @@
+@@ -525,7 +528,7 @@ static int jffs2_scan_eraseblock (struct

  
                        if (buf_size && sumlen > buf_size)
                                kfree(sumptr);
  
                        if (buf_size && sumlen > buf_size)
                                kfree(sumptr);


@@ -94,7 +94,7 @@
                           If it returns positive, that's a block classification
                           (i.e. BLK_STATE_xxx) so return that too.
                           If it returns zero, fall through to full scan. */
                           If it returns positive, that's a block classification
                           (i.e. BLK_STATE_xxx) so return that too.
                           If it returns zero, fall through to full scan. */

-@@ -546,6 +549,17 @@
+@@ -546,6 +549,17 @@ static int jffs2_scan_eraseblock (struct

                        return err;
        }
  
                        return err;
        }
  


@@ -112,7 +112,7 @@
        /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
        ofs = 0;
  
        /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
        ofs = 0;
  

-@@ -671,7 +685,7 @@
+@@ -671,7 +685,7 @@ scan_more:

                                scan_end = buf_len;
                                goto more_empty;
                        }
                                scan_end = buf_len;
                                goto more_empty;
                        }


@@ -121,7 +121,7 @@
                        /* See how much more there is to read in this eraseblock... */
                        buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
                        if (!buf_len) {
                        /* See how much more there is to read in this eraseblock... */
                        buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
                        if (!buf_len) {

-@@ -907,7 +921,7 @@
+@@ -907,7 +921,7 @@ scan_more:

  
        D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
                  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));
  
        D1(printk(KERN_DEBUG "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
                  jeb->offset,jeb->free_size, jeb->dirty_size, jeb->unchecked_size, jeb->used_size, jeb->wasted_size));

diff --git a/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch
index e812f9b51e6e2116585a4b5ff533ae960e5b524f..2196a494b2c663f5ab7145b58f511c9e24f58be0 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/r8169.c
 +++ b/drivers/net/r8169.c
 --- a/drivers/net/r8169.c
 +++ b/drivers/net/r8169.c

-@@ -1539,7 +1539,7 @@
+@@ -1539,7 +1539,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,
                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,


@@ -9,7 +9,7 @@
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
                .msi            = 0
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
                .msi            = 0

-@@ -1548,7 +1548,7 @@
+@@ -1548,7 +1548,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,
                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,


@@ -18,7 +18,7 @@
                                  TxErr | TxOK | RxOK | RxErr,
                .napi_event     = TxErr | TxOK | RxOK | RxOverflow,
                .msi            = RTL_FEATURE_MSI
                                  TxErr | TxOK | RxOK | RxErr,
                .napi_event     = TxErr | TxOK | RxOK | RxOverflow,
                .msi            = RTL_FEATURE_MSI

-@@ -1557,7 +1557,7 @@
+@@ -1557,7 +1557,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,
                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,


@@ -27,7 +27,7 @@
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
                .msi            = RTL_FEATURE_MSI
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
                .msi            = RTL_FEATURE_MSI

-@@ -2905,10 +2905,12 @@
+@@ -2905,10 +2905,12 @@ static irqreturn_t rtl8169_interrupt(int

                        break;
                }
  
                        break;
                }
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.26/209-mini_fo.patch
index aa40112e5a9d43ad016979c77a0858d0e18a72bb..9dc12d47c13c7cc7b4bb864a2c6c47c460db84c9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/209-mini_fo.patch
@@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 --- a/fs/Kconfig
 +++ b/fs/Kconfig

-@@ -1477,6 +1477,9 @@
+@@ -1477,6 +1477,9 @@ config VXFS_FS

          To compile this as a module, choose M here: the module will be
          called freevxfs.  If unsure, say N.
  
          To compile this as a module, choose M here: the module will be
          called freevxfs.  If unsure, say N.
  


@@ -12,7 +12,7 @@
        depends on BLOCK
 --- a/fs/Makefile
 +++ b/fs/Makefile
        depends on BLOCK
 --- a/fs/Makefile
 +++ b/fs/Makefile

-@@ -77,6 +77,7 @@
+@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS)               += squashfs/

  obj-y                         += ramfs/
  obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
  obj-$(CONFIG_CODA_FS)         += coda/
  obj-y                         += ramfs/
  obj-$(CONFIG_HUGETLBFS)               += hugetlbfs/
  obj-$(CONFIG_CODA_FS)         += coda/

diff --git a/target/linux/generic-2.6/patches-2.6.26/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.26/210-mini_fo_2.6.25_fixes.patch
index 22ca3900e9b40bf2cde975bcb117bb02940d03ce..d71e3b6faa6644c2337588f4b344cc5677419841 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/210-mini_fo_2.6.25_fixes.patch
@@ -1,6 +1,6 @@
 --- a/fs/mini_fo/main.c
 +++ b/fs/mini_fo/main.c
 --- a/fs/mini_fo/main.c
 +++ b/fs/mini_fo/main.c

-@@ -79,6 +79,7 @@
+@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d

         * of the new inode's fields
         */
  
         * of the new inode's fields
         */
  


@@ -8,7 +8,7 @@
        /*
         * original: inode = iget(sb, hidden_inode->i_ino);
         */
        /*
         * original: inode = iget(sb, hidden_inode->i_ino);
         */

-@@ -87,6 +88,13 @@
+@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d

                err = -EACCES;          /* should be impossible??? */
                goto out;
        }
                err = -EACCES;          /* should be impossible??? */
                goto out;
        }


@@ -22,7 +22,7 @@
  
        /*
         * interpose the inode if not already interposed
  
        /*
         * interpose the inode if not already interposed

-@@ -184,9 +192,9 @@
+@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,

                                hidden_root = ERR_PTR(err);
                                goto out;
                        }
                                hidden_root = ERR_PTR(err);
                                goto out;
                        }


@@ -35,7 +35,7 @@
  
                } else if(!strncmp("sto=", options, 4)) {
                        /* parse the storage dir */
  
                } else if(!strncmp("sto=", options, 4)) {
                        /* parse the storage dir */

-@@ -204,9 +212,9 @@
+@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,

                                hidden_root2 = ERR_PTR(err);
                                goto out;
                        }
                                hidden_root2 = ERR_PTR(err);
                                goto out;
                        }


@@ -50,7 +50,7 @@
                        /* validate storage dir, this is done in
 --- a/fs/mini_fo/mini_fo.h
 +++ b/fs/mini_fo/mini_fo.h
                        /* validate storage dir, this is done in
 --- a/fs/mini_fo/mini_fo.h
 +++ b/fs/mini_fo/mini_fo.h

-@@ -302,6 +302,10 @@
+@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_

  extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
                           dentry_t *src_dentry, struct vfsmount *src_mnt);
  
  extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
                           dentry_t *src_dentry, struct vfsmount *src_mnt);
  


@@ -61,7 +61,7 @@
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
  extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
  
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
  extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
  

-@@ -501,6 +505,29 @@
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct 

  #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
  #endif /* __KERNEL__ */
  
  #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
  #endif /* __KERNEL__ */
  


@@ -93,7 +93,7 @@
   */
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
   */
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c

-@@ -262,10 +262,31 @@
+@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)

  }
  #endif
  
  }
  #endif
  


@@ -127,7 +127,7 @@
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c

-@@ -164,11 +164,11 @@
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 

        err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
  
        /* validate */
        err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
  
        /* validate */

diff --git a/target/linux/generic-2.6/patches-2.6.26/211-mini_fo_2.6.25_dentry_open_war.patch b/target/linux/generic-2.6/patches-2.6.26/211-mini_fo_2.6.25_dentry_open_war.patch
index 14a9f37666924618eace41322f5014978ad40da9..48a19429b996fdadc74305005d6aa07cc648ca8a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/211-mini_fo_2.6.25_dentry_open_war.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/211-mini_fo_2.6.25_dentry_open_war.patch
@@ -1,6 +1,6 @@
 --- a/fs/mini_fo/meta.c
 +++ b/fs/mini_fo/meta.c
 --- a/fs/mini_fo/meta.c
 +++ b/fs/mini_fo/meta.c

-@@ -442,6 +442,11 @@
+@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,

                           S_IRUSR | S_IWUSR);
  #endif
        }
                           S_IRUSR | S_IWUSR);
  #endif
        }


@@ -12,7 +12,7 @@
          /* open META-file for writing */
          meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
          if(!meta_file || IS_ERR(meta_file)) {
          /* open META-file for writing */
          meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
          if(!meta_file || IS_ERR(meta_file)) {

-@@ -535,6 +540,11 @@
+@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,

                           meta_dentry, S_IRUSR | S_IWUSR);
  #endif
        }
                           meta_dentry, S_IRUSR | S_IWUSR);
  #endif
        }


@@ -24,7 +24,7 @@
          /* open META-file for writing */
          meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
          if(!meta_file || IS_ERR(meta_file)) {
          /* open META-file for writing */
          meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
          if(!meta_file || IS_ERR(meta_file)) {

-@@ -671,14 +681,16 @@
+@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i

                }
        }
  
                }
        }
  


@@ -44,7 +44,7 @@
                dput(meta_dentry);
                err = -1;
                  goto out;
                dput(meta_dentry);
                err = -1;
                  goto out;

-@@ -811,14 +823,16 @@
+@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i

                }
        }
  
                }
        }
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch
index f4a4572b4517ae84b08315a8ff78a58c910294d3..8bd9ba32447e15df6ebc7153edfe89dfd38f43f6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/212-mini_fo_2.6.26_fixes.patch
@@ -1,6 +1,6 @@
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c

-@@ -84,6 +84,7 @@
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 

  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  
  
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  
  


@@ -8,7 +8,7 @@
  STATIC void
  mini_fo_put_inode(inode_t *inode)
  {
  STATIC void
  mini_fo_put_inode(inode_t *inode)
  {

-@@ -99,6 +100,7 @@
+@@ -99,6 +100,7 @@ mini_fo_put_inode(inode_t *inode)

        if (atomic_read(&inode->i_count) == 1)
                inode->i_nlink = 0;
  }
        if (atomic_read(&inode->i_count) == 1)
                inode->i_nlink = 0;
  }


@@ -16,7 +16,7 @@
  
  
  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
  
  
  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)

-@@ -238,7 +240,7 @@
+@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)

   * dies.
   */
  STATIC void
   * dies.
   */
  STATIC void


@@ -25,7 +25,7 @@
  mini_fo_umount_begin(struct vfsmount *mnt, int flags)
  {
        struct vfsmount *hidden_mnt;
  mini_fo_umount_begin(struct vfsmount *mnt, int flags)
  {
        struct vfsmount *hidden_mnt;

-@@ -290,7 +292,9 @@
+@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =

  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
        write_inode:    mini_fo_write_inode,
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  #if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
        write_inode:    mini_fo_write_inode,
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */

diff --git a/target/linux/generic-2.6/patches-2.6.26/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.26/213-kobject_uevent.patch
index 93ed1d035c05e8590402f169064473ec6bacde26..279665e869c6adac3d433e3208cf9ca0367aa2f1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/213-kobject_uevent.patch
@@ -1,6 +1,6 @@
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c

-@@ -29,7 +29,8 @@
+@@ -29,7 +29,8 @@ u64 uevent_seqnum;

  char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
  static DEFINE_SPINLOCK(sequence_lock);
  #if defined(CONFIG_NET)
  char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
  static DEFINE_SPINLOCK(sequence_lock);
  #if defined(CONFIG_NET)


@@ -10,7 +10,7 @@
  #endif
  
  /* the strings here must match the enum in include/linux/kobject.h */
  #endif
  
  /* the strings here must match the enum in include/linux/kobject.h */

-@@ -42,6 +43,18 @@
+@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {

        [KOBJ_OFFLINE] =        "offline",
  };
  
        [KOBJ_OFFLINE] =        "offline",
  };
  


@@ -29,7 +29,7 @@
  /**
   * kobject_action_type - translate action string to numeric type
   *
  /**
   * kobject_action_type - translate action string to numeric type
   *

-@@ -194,9 +207,7 @@
+@@ -194,9 +207,7 @@ int kobject_uevent_env(struct kobject *k

                kobj->state_remove_uevent_sent = 1;
  
        /* we will send an event, so request a new sequence number */
                kobj->state_remove_uevent_sent = 1;
  
        /* we will send an event, so request a new sequence number */

diff --git a/target/linux/generic-2.6/patches-2.6.26/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.26/220-sound_kconfig.patch
index c052f2ad29ec2007baf83e858469cdcebef4fa57..d215d120779a9a0eb5d5c3630dca9a0183c51a0a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/220-sound_kconfig.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/220-sound_kconfig.patch
@@ -1,6 +1,6 @@
 --- a/sound/core/Kconfig
 +++ b/sound/core/Kconfig
 --- a/sound/core/Kconfig
 +++ b/sound/core/Kconfig

-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ config SND_PCM

        depends on SND
  
  config SND_HWDEP
        depends on SND
  
  config SND_HWDEP

diff --git a/target/linux/generic-2.6/patches-2.6.26/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.26/400-ledtrig_morse.patch
index d7544fa0ee85f448aee4f8062b207c8fe35c0022..8560a7dca261b76acacffce4ab4db15bf8dfb7af 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/400-ledtrig_morse.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig

-@@ -190,4 +190,8 @@
+@@ -190,4 +190,8 @@ config LEDS_TRIGGER_DEFAULT_ON

          This allows LEDs to be initialised in the ON state.
          If unsure, say Y.
  
          This allows LEDs to be initialised in the ON state.
          If unsure, say Y.
  


@@ -11,7 +11,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile

-@@ -27,3 +27,4 @@
+@@ -27,3 +27,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER)     += ledt

  obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)   += ledtrig-ide-disk.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/401-led_alix.patch b/target/linux/generic-2.6/patches-2.6.26/401-led_alix.patch
index 1bec37ecba0d941a7715b3fc7bffe70ee8e541e1..80e5401c7b092187aa2179caadeb7ce9b00d0b31 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/401-led_alix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/401-led_alix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig

-@@ -77,6 +77,12 @@
+@@ -77,6 +77,12 @@ config LEDS_WRAP

        help
          This option enables support for the PCEngines WRAP programmable LEDs.
  
        help
          This option enables support for the PCEngines WRAP programmable LEDs.
  


@@ -15,7 +15,7 @@
        depends on LEDS_CLASS && ARCH_H1940
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
        depends on LEDS_CLASS && ARCH_H1940
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile

-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_LEDS_S3C24XX)           += leds-s3c2

  obj-$(CONFIG_LEDS_AMS_DELTA)          += leds-ams-delta.o
  obj-$(CONFIG_LEDS_NET48XX)            += leds-net48xx.o
  obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
  obj-$(CONFIG_LEDS_AMS_DELTA)          += leds-ams-delta.o
  obj-$(CONFIG_LEDS_NET48XX)            += leds-net48xx.o
  obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch
index 8a564b2ec80897d94a1b4ba4332f258c398a7d2a..16c6ef4a476ba5eb21f737be6640d97058e369a7 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig

-@@ -200,4 +200,11 @@
+@@ -200,4 +200,11 @@ config LEDS_TRIGGER_MORSE

        tristate "LED Morse Trigger"
        depends on LEDS_TRIGGERS
  
        tristate "LED Morse Trigger"
        depends on LEDS_TRIGGERS
  


@@ -14,7 +14,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile

-@@ -29,3 +29,4 @@
+@@ -29,3 +29,4 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)  += l

  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)  += ledtrig-heartbeat.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch b/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
index 6ae2cd7df5d4ac477e641ce7dbdfb91fe337f92a..46ca987e5327fa7e5ec218e88eb4f464613b57f8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/410-gpio_buttons.patch
@@ -1,6 +1,6 @@
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig

-@@ -197,4 +197,20 @@
+@@ -197,4 +197,20 @@ config HP_SDC_RTC

          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
  
          Say Y here if you want to support the built-in real time clock
          of the HP SDC controller.
  


@@ -23,7 +23,7 @@
  endif
 --- a/drivers/input/misc/Makefile
 +++ b/drivers/input/misc/Makefile
  endif
 --- a/drivers/input/misc/Makefile
 +++ b/drivers/input/misc/Makefile

-@@ -19,3 +19,4 @@
+@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK)          += yealink.

  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
  obj-$(CONFIG_INPUT_APANEL)            += apanel.o
  obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
  obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
  obj-$(CONFIG_INPUT_APANEL)            += apanel.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.26/420-gpiodev.patch
index 5865521bfd5d968dd77c67ed79aef06bbb134e28..1caf2751964c0c21e31b37766f879fc1eac99f95 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/420-gpiodev.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/420-gpiodev.patch
@@ -1,6 +1,6 @@
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig

-@@ -1002,6 +1002,13 @@
+@@ -1002,6 +1002,13 @@ config CS5535_GPIO

  
          If compiled as a module, it will be called cs5535_gpio.
  
  
          If compiled as a module, it will be called cs5535_gpio.
  


@@ -16,7 +16,7 @@
        depends on CPU_VR41XX
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
        depends on CPU_VR41XX
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile

-@@ -95,6 +95,7 @@
+@@ -95,6 +95,7 @@ obj-$(CONFIG_SCx200_GPIO)    += scx200_gpio

  obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
  obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
  obj-$(CONFIG_CS5535_GPIO)     += cs5535_gpio.o
  obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
  obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
  obj-$(CONFIG_CS5535_GPIO)     += cs5535_gpio.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.26/510-yaffs_support.patch
index e0f1a9befb925d24c6bc6db779fbc483ef2d7edd..cef6ea592e2cb7a072783229befec424620a9eca 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/510-yaffs_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/510-yaffs_support.patch
@@ -1,6 +1,6 @@
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
 --- a/fs/Kconfig
 +++ b/fs/Kconfig

-@@ -421,6 +421,7 @@
+@@ -421,6 +421,7 @@ config FS_POSIX_ACL

  
  source "fs/xfs/Kconfig"
  source "fs/gfs2/Kconfig"
  
  source "fs/xfs/Kconfig"
  source "fs/gfs2/Kconfig"


@@ -10,7 +10,7 @@
        tristate "OCFS2 file system support"
 --- a/fs/Makefile
 +++ b/fs/Makefile
        tristate "OCFS2 file system support"
 --- a/fs/Makefile
 +++ b/fs/Makefile

-@@ -121,3 +121,4 @@
+@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS)                += hppfs/

  obj-$(CONFIG_DEBUG_FS)                += debugfs/
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-$(CONFIG_DEBUG_FS)                += debugfs/
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
  obj-$(CONFIG_GFS2_FS)           += gfs2/

diff --git a/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch b/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch
index ac895342f6f71290606bdd5b98761c0c350fe156..c1273363469279de8f3c6f745c50112efeb24221 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/512-yaffs_2.6.25_fix.patch
@@ -1,6 +1,6 @@
 --- a/fs/yaffs2/yaffs_fs.c
 +++ b/fs/yaffs2/yaffs_fs.c
 --- a/fs/yaffs2/yaffs_fs.c
 +++ b/fs/yaffs2/yaffs_fs.c

-@@ -181,7 +181,13 @@
+@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo

  #else
  static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
  #endif
  #else
  static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
  #endif


@@ -14,7 +14,7 @@
  
  static void yaffs_put_inode(struct inode *inode);
  static void yaffs_delete_inode(struct inode *);
  
  static void yaffs_put_inode(struct inode *inode);
  static void yaffs_delete_inode(struct inode *);

-@@ -284,7 +290,9 @@
+@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_

  
  static struct super_operations yaffs_super_ops = {
        .statfs = yaffs_statfs,
  
  static struct super_operations yaffs_super_ops = {
        .statfs = yaffs_statfs,


@@ -24,7 +24,7 @@
        .put_inode = yaffs_put_inode,
        .put_super = yaffs_put_super,
        .delete_inode = yaffs_delete_inode,
        .put_inode = yaffs_put_inode,
        .put_super = yaffs_put_super,
        .delete_inode = yaffs_delete_inode,

-@@ -844,11 +852,17 @@
+@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup

        T(YAFFS_TRACE_OS,
          (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
  
        T(YAFFS_TRACE_OS,
          (KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
  


@@ -42,7 +42,7 @@
  
        return inode;
  }
  
        return inode;
  }

-@@ -1427,6 +1441,39 @@
+@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl

  }
  
  
  }
  
  


@@ -82,7 +82,7 @@
  static void yaffs_read_inode(struct inode *inode)
  {
        /* NB This is called as a side effect of other functions, but
  static void yaffs_read_inode(struct inode *inode)
  {
        /* NB This is called as a side effect of other functions, but

-@@ -1448,6 +1495,7 @@
+@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod

  
        yaffs_GrossUnlock(dev);
  }
  
        yaffs_GrossUnlock(dev);
  }

diff --git a/target/linux/generic-2.6/patches-2.6.26/513-yaffs_2.6.26_fix.patch b/target/linux/generic-2.6/patches-2.6.26/513-yaffs_2.6.26_fix.patch
index 32bd3a5d57e0a749aef86408838e8e140c95ae26..11594547d128018640307dddfa46ef620c1d5c34 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/513-yaffs_2.6.26_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/513-yaffs_2.6.26_fix.patch
@@ -1,6 +1,6 @@
 --- a/fs/yaffs2/yaffs_fs.c
 +++ b/fs/yaffs2/yaffs_fs.c
 --- a/fs/yaffs2/yaffs_fs.c
 +++ b/fs/yaffs2/yaffs_fs.c

-@@ -76,6 +76,12 @@
+@@ -76,6 +76,12 @@ extern const char *yaffs_guts_c_version;

  
  #endif
  
  
  #endif
  


@@ -13,7 +13,7 @@
  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
  #define WRITE_SIZE_STR "writesize"
  #define WRITE_SIZE(mtd) (mtd)->writesize
  #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
  #define WRITE_SIZE_STR "writesize"
  #define WRITE_SIZE(mtd) (mtd)->writesize

-@@ -189,7 +195,9 @@
+@@ -189,7 +195,9 @@ static void yaffs_read_inode(struct inod

  #endif
  
  
  #endif
  
  


@@ -23,7 +23,7 @@
  static void yaffs_delete_inode(struct inode *);
  static void yaffs_clear_inode(struct inode *);
  
  static void yaffs_delete_inode(struct inode *);
  static void yaffs_clear_inode(struct inode *);
  

-@@ -293,7 +301,9 @@
+@@ -293,7 +301,9 @@ static struct super_operations yaffs_sup

  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
        .read_inode = yaffs_read_inode,
  #endif
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
        .read_inode = yaffs_read_inode,
  #endif


@@ -33,7 +33,7 @@
        .put_super = yaffs_put_super,
        .delete_inode = yaffs_delete_inode,
        .clear_inode = yaffs_clear_inode,
        .put_super = yaffs_put_super,
        .delete_inode = yaffs_delete_inode,
        .clear_inode = yaffs_clear_inode,

-@@ -437,6 +447,7 @@
+@@ -437,6 +447,7 @@ static struct dentry *yaffs_lookup(struc

  
  }
  
  
  }
  


@@ -41,7 +41,7 @@
  /* For now put inode is just for debugging
   * Put inode is called when the inode **structure** is put.
   */
  /* For now put inode is just for debugging
   * Put inode is called when the inode **structure** is put.
   */

-@@ -447,6 +458,7 @@
+@@ -447,6 +458,7 @@ static void yaffs_put_inode(struct inode

           atomic_read(&inode->i_count)));
  
  }
           atomic_read(&inode->i_count)));
  
  }


@@ -49,7 +49,7 @@
  
  /* clear is called to tell the fs to release any per-inode data it holds */
  static void yaffs_clear_inode(struct inode *inode)
  
  /* clear is called to tell the fs to release any per-inode data it holds */
  static void yaffs_clear_inode(struct inode *inode)

-@@ -2279,7 +2291,7 @@
+@@ -2279,7 +2291,7 @@ static int __init init_yaffs_fs(void)

        /* Install the proc_fs entry */
        my_proc_entry = create_proc_entry("yaffs",
                                               S_IRUGO | S_IFREG,
        /* Install the proc_fs entry */
        my_proc_entry = create_proc_entry("yaffs",
                                               S_IRUGO | S_IFREG,


@@ -58,7 +58,7 @@
  
        if (my_proc_entry) {
                my_proc_entry->write_proc = yaffs_proc_write;
  
        if (my_proc_entry) {
                my_proc_entry->write_proc = yaffs_proc_write;

-@@ -2325,7 +2337,7 @@
+@@ -2325,7 +2337,7 @@ static void __exit exit_yaffs_fs(void)

        T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
                               " removing. \n"));
  
        T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
                               " removing. \n"));
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
index 39f22bbdefb8e296b81e28aded6713e24db0d219..cacb7483aef46113420ed939403a3fd5f9224bcf 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/600-phy_extension.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c

-@@ -348,6 +348,50 @@
+@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *

  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  
  }
  EXPORT_SYMBOL(phy_ethtool_gset);
  


@@ -51,7 +51,7 @@
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct
  /**
   * phy_mii_ioctl - generic PHY MII ioctl interface
   * @phydev: the phy_device struct

-@@ -403,8 +447,8 @@
+@@ -403,8 +447,8 @@ int phy_mii_ioctl(struct phy_device *phy

                }
  
                phy_write(phydev, mii_data->reg_num, val);
                }
  
                phy_write(phydev, mii_data->reg_num, val);


@@ -62,7 +62,7 @@
                                && val & BMCR_RESET
                                && phydev->drv->config_init) {
                        phy_scan_fixups(phydev);
                                && val & BMCR_RESET
                                && phydev->drv->config_init) {
                        phy_scan_fixups(phydev);

-@@ -524,7 +568,7 @@
+@@ -524,7 +568,7 @@ static void phy_force_reduction(struct p

        int idx;
  
        idx = phy_find_setting(phydev->speed, phydev->duplex);
        int idx;
  
        idx = phy_find_setting(phydev->speed, phydev->duplex);


@@ -73,7 +73,7 @@
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
        idx = phy_find_valid(idx, phydev->supported);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -434,6 +434,7 @@
+@@ -434,6 +434,7 @@ void phy_start_machine(struct phy_device

  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  void phy_stop_machine(struct phy_device *phydev);
  int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
  int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

diff --git a/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch
index 5cc9cd2895c84d83b9a5fedf14963c519067d2f0..fb46bce6ea3a087c19b0aa6f6d20e9bf758771f8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/610-phy_detect.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c

-@@ -135,6 +135,9 @@
+@@ -135,6 +135,9 @@ static int mdio_bus_match(struct device 

        struct phy_device *phydev = to_phy_device(dev);
        struct phy_driver *phydrv = to_phy_driver(drv);
  
        struct phy_device *phydev = to_phy_device(dev);
        struct phy_driver *phydrv = to_phy_driver(drv);
  


@@ -12,7 +12,7 @@
  }
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
  }
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -339,6 +339,11 @@
+@@ -339,6 +339,11 @@ struct phy_driver {

        u32 features;
        u32 flags;
  
        u32 features;
        u32 flags;
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.26/620-phy_adm6996.patch
index 46e6bf34b63465ace7004a916bf110a7b54624f2..1b035cbdbb42b23b0197ae17bb11ea379dd46643 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/620-phy_adm6996.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/620-phy_adm6996.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig

-@@ -65,6 +65,11 @@
+@@ -65,6 +65,11 @@ config REALTEK_PHY

        ---help---
          Supports the Realtek 821x PHY.
  
        ---help---
          Supports the Realtek 821x PHY.
  


@@ -14,7 +14,7 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile

-@@ -12,6 +12,7 @@
+@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY)               += smsc.o

  obj-$(CONFIG_VITESSE_PHY)     += vitesse.o
  obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_VITESSE_PHY)     += vitesse.o
  obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
index a561bb29c1bdd54cc29e7ef60fd7f35a91e4e33b..b4e8b4dbe7c13ead0796c57a1773e48d27fccace 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c

-@@ -143,6 +143,18 @@
+@@ -143,6 +143,18 @@ int phy_scan_fixups(struct phy_device *p

  }
  EXPORT_SYMBOL(phy_scan_fixups);
  
  }
  EXPORT_SYMBOL(phy_scan_fixups);
  


@@ -19,7 +19,7 @@
  struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
  {
        struct phy_device *dev;
  struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
  {
        struct phy_device *dev;

-@@ -168,6 +180,8 @@
+@@ -168,6 +180,8 @@ struct phy_device* phy_device_create(str

        dev->bus = bus;
  
        dev->state = PHY_DOWN;
        dev->bus = bus;
  
        dev->state = PHY_DOWN;


@@ -30,7 +30,7 @@
  
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
  
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -309,6 +309,20 @@
+@@ -309,6 +309,20 @@ struct phy_device {

        void (*adjust_link)(struct net_device *dev);
  
        void (*adjust_state)(struct net_device *dev);
        void (*adjust_link)(struct net_device *dev);
  
        void (*adjust_state)(struct net_device *dev);


@@ -53,7 +53,7 @@
  
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
  
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h

-@@ -613,6 +613,7 @@
+@@ -613,6 +613,7 @@ struct net_device

        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                   assign before registering */
        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                   assign before registering */

diff --git a/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch
index 85b8cb4f916c9fce58642c28beddeecbff432563..c2d7d1c0de51e782b6559619ac8e1b1c24341215 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig

-@@ -70,6 +70,12 @@
+@@ -70,6 +70,12 @@ config ADM6996_PHY

        ---help---
          Currently supports the ADM6996F switch
  
        ---help---
          Currently supports the ADM6996F switch
  


@@ -15,7 +15,7 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile

-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY)    += vitesse.o

  obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_ADM6996_PHY)     += adm6996.o
  obj-$(CONFIG_BROADCOM_PHY)    += broadcom.o
  obj-$(CONFIG_ICPLUS_PHY)      += icplus.o
  obj-$(CONFIG_ADM6996_PHY)     += adm6996.o


@@ -38,7 +38,7 @@
  /**
   * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
   * @bus: target mii_bus
  /**
   * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
   * @bus: target mii_bus

-@@ -85,6 +91,7 @@
+@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus

  
                        phydev->dev.parent = bus->dev;
                        phydev->dev.bus = &mdio_bus_type;
  
                        phydev->dev.parent = bus->dev;
                        phydev->dev.bus = &mdio_bus_type;

diff --git a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
index e7bc6c52f4a11456d6b76b09f380e6a2ee517895..d1e2c5bef0014e1cf57af6d4462428e2f14e6246 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/serial/usb-serial.c
 +++ b/drivers/usb/serial/usb-serial.c
 --- a/drivers/usb/serial/usb-serial.c
 +++ b/drivers/usb/serial/usb-serial.c

-@@ -58,6 +58,7 @@
+@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv

     drivers depend on it.
  */
  
     drivers depend on it.
  */
  


@@ -8,7 +8,7 @@
  static int debug;
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];    /* initially all NULL */
  static DEFINE_MUTEX(table_lock);
  static int debug;
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];    /* initially all NULL */
  static DEFINE_MUTEX(table_lock);

-@@ -814,7 +815,7 @@
+@@ -814,7 +815,7 @@ int usb_serial_probe(struct usb_interfac

                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }
                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }


@@ -17,7 +17,7 @@
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);

-@@ -1228,3 +1229,5 @@
+@@ -1228,3 +1229,5 @@ MODULE_LICENSE("GPL");

  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");
  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");

diff --git a/target/linux/generic-2.6/patches-2.6.26/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.26/840-unable_to_open_console.patch
index ec13777dd3f07293ad24cc41023b17aef47c919b..bfaf0617d79a246914169e12cc14f2ff76061110 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/840-unable_to_open_console.patch
@@ -1,6 +1,6 @@
 --- a/init/main.c
 +++ b/init/main.c
 --- a/init/main.c
 +++ b/init/main.c

-@@ -803,7 +803,7 @@
+@@ -803,7 +803,7 @@ static int noinline init_post(void)

        numa_default_policy();
  
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
        numa_default_policy();
  
        if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

diff --git a/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch
index b318c906069013ba556c14477563fdcac4055bac..b12387280ab1ca0a62989e35bb6d9eed96970891 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch
@@ -11,7 +11,7 @@
  #include <linux/types.h>
  
  #ifdef __KERNEL__
  #include <linux/types.h>
  
  #ifdef __KERNEL__

-@@ -228,4 +232,6 @@
+@@ -228,4 +232,6 @@ struct itimerval {

   */
  #define TIMER_ABSTIME                 0x01
  
   */
  #define TIMER_ABSTIME                 0x01
  


@@ -35,7 +35,7 @@
  #ifdef        __KERNEL__
  
  #define DECLARE_BITMAP(name,bits) \
  #ifdef        __KERNEL__
  
  #define DECLARE_BITMAP(name,bits) \

-@@ -161,6 +169,8 @@
+@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;

  
  #endif /* __KERNEL_STRICT_NAMES */
  
  
  #endif /* __KERNEL_STRICT_NAMES */
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.26/902-darwin_scripts_include.patch
index 5d454b8e017a97492cf68fb3bd3e50d525f07d56..96fffc0660d2252a1784e7ba3b8786476e0513fc 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/902-darwin_scripts_include.patch
@@ -62,7 +62,7 @@
  
 --- a/scripts/kconfig/Makefile
 +++ b/scripts/kconfig/Makefile
  
 --- a/scripts/kconfig/Makefile
 +++ b/scripts/kconfig/Makefile

-@@ -93,6 +93,9 @@
+@@ -93,6 +93,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd

  # we really need to do so. (Do not call gcc as part of make mrproper)
  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
  # we really need to do so. (Do not call gcc as part of make mrproper)
  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

diff --git a/target/linux/generic-2.6/patches-2.6.26/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.26/903-hostap_txpower.patch
index 3d6d5d097632c1121efe8c3239da4d46999f41dc..92cb2d108a72d2c8f3313524c20dccd16905fb8a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/903-hostap_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c

-@@ -2397,13 +2397,13 @@
+@@ -2397,13 +2397,13 @@ int prism2_ap_get_sta_qual(local_info_t 

                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)
                addr[count].sa_family = ARPHRD_ETHER;
                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
                if (sta->last_rx_silence == 0)


@@ -20,7 +20,7 @@
                qual[count].updated = sta->last_rx_updated;
  
                sta->last_rx_updated = IW_QUAL_DBM;
                qual[count].updated = sta->last_rx_updated;
  
                sta->last_rx_updated = IW_QUAL_DBM;

-@@ -2468,13 +2468,13 @@
+@@ -2468,13 +2468,13 @@ int prism2_ap_translate_scan(struct net_

                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVQUAL;
                if (sta->last_rx_silence == 0)
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVQUAL;
                if (sta->last_rx_silence == 0)


@@ -54,7 +54,7 @@
  #endif /* HOSTAP_CONFIG_H */
 --- a/drivers/net/wireless/hostap/hostap.h
 +++ b/drivers/net/wireless/hostap/hostap.h
  #endif /* HOSTAP_CONFIG_H */
 --- a/drivers/net/wireless/hostap/hostap.h
 +++ b/drivers/net/wireless/hostap/hostap.h

-@@ -89,6 +89,7 @@
+@@ -89,6 +89,7 @@ extern const struct iw_handler_def hosta

  extern const struct ethtool_ops prism2_ethtool_ops;
  
  int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
  extern const struct ethtool_ops prism2_ethtool_ops;
  
  int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);


@@ -64,7 +64,7 @@
  #endif /* HOSTAP_H */
 --- a/drivers/net/wireless/hostap/hostap_hw.c
 +++ b/drivers/net/wireless/hostap/hostap_hw.c
  #endif /* HOSTAP_H */
 --- a/drivers/net/wireless/hostap/hostap_hw.c
 +++ b/drivers/net/wireless/hostap/hostap_hw.c

-@@ -933,6 +933,7 @@
+@@ -933,6 +933,7 @@ static int hfa384x_set_rid(struct net_de

                        prism2_hw_reset(dev);
        }
  
                        prism2_hw_reset(dev);
        }
  


@@ -74,7 +74,7 @@
  
 --- a/drivers/net/wireless/hostap/hostap_info.c
 +++ b/drivers/net/wireless/hostap/hostap_info.c
  
 --- a/drivers/net/wireless/hostap/hostap_info.c
 +++ b/drivers/net/wireless/hostap/hostap_info.c

-@@ -434,6 +434,11 @@
+@@ -434,6 +434,11 @@ static void handle_info_queue_linkstatus

        }
  
        /* Get BSSID if we have a valid AP address */
        }
  
        /* Get BSSID if we have a valid AP address */


@@ -88,7 +88,7 @@
                netif_carrier_on(local->ddev);
 --- a/drivers/net/wireless/hostap/hostap_ioctl.c
 +++ b/drivers/net/wireless/hostap/hostap_ioctl.c
                netif_carrier_on(local->ddev);
 --- a/drivers/net/wireless/hostap/hostap_ioctl.c
 +++ b/drivers/net/wireless/hostap/hostap_ioctl.c

-@@ -1500,23 +1500,20 @@
+@@ -1500,23 +1500,20 @@ static int prism2_txpower_hfa386x_to_dBm

                val = 255;
  
        tmp = val;
                val = 255;
  
        tmp = val;


@@ -116,7 +116,7 @@
  
        return (unsigned char) tmp;
  }
  
        return (unsigned char) tmp;
  }

-@@ -4076,3 +4073,35 @@
+@@ -4076,3 +4073,35 @@ int hostap_ioctl(struct net_device *dev,

  
        return ret;
  }
  
        return ret;
  }

diff --git a/target/linux/generic-2.6/patches-2.6.26/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.26/903-stddef_include.patch
index c0c01c0101b474eeec025495cad4d246408387ed..7fe248d8d333820172dba0c46fc5bfd11103169a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/903-stddef_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/903-stddef_include.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/stddef.h
 +++ b/include/linux/stddef.h
 --- a/include/linux/stddef.h
 +++ b/include/linux/stddef.h

-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ enum {

        false   = 0,
        true    = 1
  };
        false   = 0,
        true    = 1
  };


@@ -8,7 +8,7 @@
  
  #undef offsetof
  #ifdef __compiler_offsetof
  
  #undef offsetof
  #ifdef __compiler_offsetof

-@@ -23,6 +24,5 @@
+@@ -23,6 +24,5 @@ enum {

  #else
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  #endif
  #else
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  #endif

diff --git a/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch b/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch
index a2d64367c47a34cc359c3336b3706e0eca081ce1..5cc6fa4c9bf7bfb6d0dda7f96b3785571024ef9e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch
@@ -1,6 +1,6 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig

-@@ -65,6 +65,7 @@
+@@ -65,6 +65,7 @@ config CRYPTO_NULL

  config CRYPTO_CRYPTD
        tristate "Software async crypto daemon"
        select CRYPTO_BLKCIPHER
  config CRYPTO_CRYPTD
        tristate "Software async crypto daemon"
        select CRYPTO_BLKCIPHER


@@ -8,7 +8,7 @@
        select CRYPTO_MANAGER
        help
          This is a generic software asynchronous crypto daemon that
        select CRYPTO_MANAGER
        help
          This is a generic software asynchronous crypto daemon that

-@@ -212,7 +213,7 @@
+@@ -212,7 +213,7 @@ comment "Digest"

  
  config CRYPTO_CRC32C
        tristate "CRC32c CRC algorithm"
  
  config CRYPTO_CRC32C
        tristate "CRC32c CRC algorithm"


@@ -17,7 +17,7 @@
        select LIBCRC32C
        help
          Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used
        select LIBCRC32C
        help
          Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used

-@@ -241,6 +242,57 @@
+@@ -241,6 +242,57 @@ config CRYPTO_MICHAEL_MIC

          should not be used for other purposes because of the weakness
          of the algorithm.
  
          should not be used for other purposes because of the weakness
          of the algorithm.
  


@@ -75,7 +75,7 @@
  config CRYPTO_SHA1
        tristate "SHA1 digest algorithm"
        select CRYPTO_ALGAPI
  config CRYPTO_SHA1
        tristate "SHA1 digest algorithm"
        select CRYPTO_ALGAPI

-@@ -614,6 +666,15 @@
+@@ -614,6 +666,15 @@ config CRYPTO_LZO

        help
          This is the LZO algorithm.
  
        help
          This is the LZO algorithm.
  


@@ -93,7 +93,7 @@
  endif # if CRYPTO
 --- a/crypto/Makefile
 +++ b/crypto/Makefile
  endif # if CRYPTO
 --- a/crypto/Makefile
 +++ b/crypto/Makefile

-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto

  obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
  
  crypto_hash-objs := hash.o
  obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
  
  crypto_hash-objs := hash.o


@@ -101,7 +101,7 @@
  obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
  
  obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o
  obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
  
  obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o

-@@ -27,6 +28,10 @@
+@@ -27,6 +28,10 @@ obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o

  obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
  obj-$(CONFIG_CRYPTO_MD4) += md4.o
  obj-$(CONFIG_CRYPTO_MD5) += md5.o
  obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
  obj-$(CONFIG_CRYPTO_MD4) += md4.o
  obj-$(CONFIG_CRYPTO_MD5) += md5.o


@@ -112,7 +112,7 @@
  obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o
  obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o
  obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o
  obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o
  obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o
  obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o

-@@ -64,7 +69,7 @@
+@@ -64,7 +69,7 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich

  obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o
  obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o


@@ -320,7 +320,7 @@
 +MODULE_DESCRIPTION("Asynchronous cryptographic hash type");
 --- a/crypto/api.c
 +++ b/crypto/api.c
 +MODULE_DESCRIPTION("Asynchronous cryptographic hash type");
 --- a/crypto/api.c
 +++ b/crypto/api.c

-@@ -235,8 +235,12 @@
+@@ -235,8 +235,12 @@ static int crypto_init_ops(struct crypto

                return crypto_init_cipher_ops(tfm);
                
        case CRYPTO_ALG_TYPE_DIGEST:
                return crypto_init_cipher_ops(tfm);
                
        case CRYPTO_ALG_TYPE_DIGEST:


@@ -346,7 +346,7 @@
  
  static const u32 camellia_sp1110[256] = {
        0x70707000,0x82828200,0x2c2c2c00,0xececec00,
  
  static const u32 camellia_sp1110[256] = {
        0x70707000,0x82828200,0x2c2c2c00,0xececec00,

-@@ -335,20 +337,6 @@
+@@ -335,20 +337,6 @@ static const u32 camellia_sp4404[256] = 

  /*
   *  macros
   */
  /*
   *  macros
   */


@@ -367,7 +367,7 @@
  #define ROLDQ(ll, lr, rl, rr, w0, w1, bits)           \
      do {                                              \
        w0 = ll;                                        \
  #define ROLDQ(ll, lr, rl, rr, w0, w1, bits)           \
      do {                                              \
        w0 = ll;                                        \

-@@ -383,7 +371,7 @@
+@@ -383,7 +371,7 @@ static const u32 camellia_sp4404[256] = 

           ^ camellia_sp3033[(u8)(il >> 8)]                     \
           ^ camellia_sp4404[(u8)(il     )];                    \
        yl ^= yr;                                               \
           ^ camellia_sp3033[(u8)(il >> 8)]                     \
           ^ camellia_sp4404[(u8)(il     )];                    \
        yl ^= yr;                                               \


@@ -376,7 +376,7 @@
        yr ^= yl;                                               \
      } while(0)
  
        yr ^= yl;                                               \
      } while(0)
  

-@@ -405,7 +393,7 @@
+@@ -405,7 +393,7 @@ static void camellia_setup_tail(u32 *sub

        subL[7] ^= subL[1]; subR[7] ^= subR[1];
        subL[1] ^= subR[1] & ~subR[9];
        dw = subL[1] & subL[9],
        subL[7] ^= subL[1]; subR[7] ^= subR[1];
        subL[1] ^= subR[1] & ~subR[9];
        dw = subL[1] & subL[9],


@@ -385,7 +385,7 @@
        /* round 8 */
        subL[11] ^= subL[1]; subR[11] ^= subR[1];
        /* round 10 */
        /* round 8 */
        subL[11] ^= subL[1]; subR[11] ^= subR[1];
        /* round 10 */

-@@ -414,7 +402,7 @@
+@@ -414,7 +402,7 @@ static void camellia_setup_tail(u32 *sub

        subL[15] ^= subL[1]; subR[15] ^= subR[1];
        subL[1] ^= subR[1] & ~subR[17];
        dw = subL[1] & subL[17],
        subL[15] ^= subL[1]; subR[15] ^= subR[1];
        subL[1] ^= subR[1] & ~subR[17];
        dw = subL[1] & subL[17],


@@ -394,7 +394,7 @@
        /* round 14 */
        subL[19] ^= subL[1]; subR[19] ^= subR[1];
        /* round 16 */
        /* round 14 */
        subL[19] ^= subL[1]; subR[19] ^= subR[1];
        /* round 16 */

-@@ -430,7 +418,7 @@
+@@ -430,7 +418,7 @@ static void camellia_setup_tail(u32 *sub

        } else {
                subL[1] ^= subR[1] & ~subR[25];
                dw = subL[1] & subL[25],
        } else {
                subL[1] ^= subR[1] & ~subR[25];
                dw = subL[1] & subL[25],


@@ -403,7 +403,7 @@
                /* round 20 */
                subL[27] ^= subL[1]; subR[27] ^= subR[1];
                /* round 22 */
                /* round 20 */
                subL[27] ^= subL[1]; subR[27] ^= subR[1];
                /* round 22 */

-@@ -450,7 +438,7 @@
+@@ -450,7 +438,7 @@ static void camellia_setup_tail(u32 *sub

                subL[26] ^= kw4l; subR[26] ^= kw4r;
                kw4l ^= kw4r & ~subR[24];
                dw = kw4l & subL[24],
                subL[26] ^= kw4l; subR[26] ^= kw4r;
                kw4l ^= kw4r & ~subR[24];
                dw = kw4l & subL[24],


@@ -412,7 +412,7 @@
        }
        /* round 17 */
        subL[22] ^= kw4l; subR[22] ^= kw4r;
        }
        /* round 17 */
        subL[22] ^= kw4l; subR[22] ^= kw4r;

-@@ -460,7 +448,7 @@
+@@ -460,7 +448,7 @@ static void camellia_setup_tail(u32 *sub

        subL[18] ^= kw4l; subR[18] ^= kw4r;
        kw4l ^= kw4r & ~subR[16];
        dw = kw4l & subL[16],
        subL[18] ^= kw4l; subR[18] ^= kw4r;
        kw4l ^= kw4r & ~subR[16];
        dw = kw4l & subL[16],


@@ -421,7 +421,7 @@
        /* round 11 */
        subL[14] ^= kw4l; subR[14] ^= kw4r;
        /* round 9 */
        /* round 11 */
        subL[14] ^= kw4l; subR[14] ^= kw4r;
        /* round 9 */

-@@ -469,7 +457,7 @@
+@@ -469,7 +457,7 @@ static void camellia_setup_tail(u32 *sub

        subL[10] ^= kw4l; subR[10] ^= kw4r;
        kw4l ^= kw4r & ~subR[8];
        dw = kw4l & subL[8],
        subL[10] ^= kw4l; subR[10] ^= kw4r;
        kw4l ^= kw4r & ~subR[8];
        dw = kw4l & subL[8],


@@ -430,7 +430,7 @@
        /* round 5 */
        subL[6] ^= kw4l; subR[6] ^= kw4r;
        /* round 3 */
        /* round 5 */
        subL[6] ^= kw4l; subR[6] ^= kw4r;
        /* round 3 */

-@@ -494,7 +482,7 @@
+@@ -494,7 +482,7 @@ static void camellia_setup_tail(u32 *sub

        SUBKEY_R(6) = subR[5] ^ subR[7];
        tl = subL[10] ^ (subR[10] & ~subR[8]);
        dw = tl & subL[8],  /* FL(kl1) */
        SUBKEY_R(6) = subR[5] ^ subR[7];
        tl = subL[10] ^ (subR[10] & ~subR[8]);
        dw = tl & subL[8],  /* FL(kl1) */


@@ -439,7 +439,7 @@
        SUBKEY_L(7) = subL[6] ^ tl; /* round 6 */
        SUBKEY_R(7) = subR[6] ^ tr;
        SUBKEY_L(8) = subL[8];       /* FL(kl1) */
        SUBKEY_L(7) = subL[6] ^ tl; /* round 6 */
        SUBKEY_R(7) = subR[6] ^ tr;
        SUBKEY_L(8) = subL[8];       /* FL(kl1) */

-@@ -503,7 +491,7 @@
+@@ -503,7 +491,7 @@ static void camellia_setup_tail(u32 *sub

        SUBKEY_R(9) = subR[9];
        tl = subL[7] ^ (subR[7] & ~subR[9]);
        dw = tl & subL[9],  /* FLinv(kl2) */
        SUBKEY_R(9) = subR[9];
        tl = subL[7] ^ (subR[7] & ~subR[9]);
        dw = tl & subL[9],  /* FLinv(kl2) */


@@ -448,7 +448,7 @@
        SUBKEY_L(10) = tl ^ subL[11]; /* round 7 */
        SUBKEY_R(10) = tr ^ subR[11];
        SUBKEY_L(11) = subL[10] ^ subL[12]; /* round 8 */
        SUBKEY_L(10) = tl ^ subL[11]; /* round 7 */
        SUBKEY_R(10) = tr ^ subR[11];
        SUBKEY_L(11) = subL[10] ^ subL[12]; /* round 8 */

-@@ -516,7 +504,7 @@
+@@ -516,7 +504,7 @@ static void camellia_setup_tail(u32 *sub

        SUBKEY_R(14) = subR[13] ^ subR[15];
        tl = subL[18] ^ (subR[18] & ~subR[16]);
        dw = tl & subL[16], /* FL(kl3) */
        SUBKEY_R(14) = subR[13] ^ subR[15];
        tl = subL[18] ^ (subR[18] & ~subR[16]);
        dw = tl & subL[16], /* FL(kl3) */


@@ -457,7 +457,7 @@
        SUBKEY_L(15) = subL[14] ^ tl; /* round 12 */
        SUBKEY_R(15) = subR[14] ^ tr;
        SUBKEY_L(16) = subL[16];     /* FL(kl3) */
        SUBKEY_L(15) = subL[14] ^ tl; /* round 12 */
        SUBKEY_R(15) = subR[14] ^ tr;
        SUBKEY_L(16) = subL[16];     /* FL(kl3) */

-@@ -525,7 +513,7 @@
+@@ -525,7 +513,7 @@ static void camellia_setup_tail(u32 *sub

        SUBKEY_R(17) = subR[17];
        tl = subL[15] ^ (subR[15] & ~subR[17]);
        dw = tl & subL[17], /* FLinv(kl4) */
        SUBKEY_R(17) = subR[17];
        tl = subL[15] ^ (subR[15] & ~subR[17]);
        dw = tl & subL[17], /* FLinv(kl4) */


@@ -466,7 +466,7 @@
        SUBKEY_L(18) = tl ^ subL[19]; /* round 13 */
        SUBKEY_R(18) = tr ^ subR[19];
        SUBKEY_L(19) = subL[18] ^ subL[20]; /* round 14 */
        SUBKEY_L(18) = tl ^ subL[19]; /* round 13 */
        SUBKEY_R(18) = tr ^ subR[19];
        SUBKEY_L(19) = subL[18] ^ subL[20]; /* round 14 */

-@@ -544,7 +532,7 @@
+@@ -544,7 +532,7 @@ static void camellia_setup_tail(u32 *sub

        } else {
                tl = subL[26] ^ (subR[26] & ~subR[24]);
                dw = tl & subL[24], /* FL(kl5) */
        } else {
                tl = subL[26] ^ (subR[26] & ~subR[24]);
                dw = tl & subL[24], /* FL(kl5) */


@@ -475,7 +475,7 @@
                SUBKEY_L(23) = subL[22] ^ tl; /* round 18 */
                SUBKEY_R(23) = subR[22] ^ tr;
                SUBKEY_L(24) = subL[24];     /* FL(kl5) */
                SUBKEY_L(23) = subL[22] ^ tl; /* round 18 */
                SUBKEY_R(23) = subR[22] ^ tr;
                SUBKEY_L(24) = subL[24];     /* FL(kl5) */

-@@ -553,7 +541,7 @@
+@@ -553,7 +541,7 @@ static void camellia_setup_tail(u32 *sub

                SUBKEY_R(25) = subR[25];
                tl = subL[23] ^ (subR[23] & ~subR[25]);
                dw = tl & subL[25], /* FLinv(kl6) */
                SUBKEY_R(25) = subR[25];
                tl = subL[23] ^ (subR[23] & ~subR[25]);
                dw = tl & subL[25], /* FLinv(kl6) */


@@ -484,7 +484,7 @@
                SUBKEY_L(26) = tl ^ subL[27]; /* round 19 */
                SUBKEY_R(26) = tr ^ subR[27];
                SUBKEY_L(27) = subL[26] ^ subL[28]; /* round 20 */
                SUBKEY_L(26) = tl ^ subL[27]; /* round 19 */
                SUBKEY_R(26) = tr ^ subR[27];
                SUBKEY_L(27) = subL[26] ^ subL[28]; /* round 20 */

-@@ -573,17 +561,17 @@
+@@ -573,17 +561,17 @@ static void camellia_setup_tail(u32 *sub

        /* apply the inverse of the last half of P-function */
        i = 2;
        do {
        /* apply the inverse of the last half of P-function */
        i = 2;
        do {


@@ -508,7 +508,7 @@
                SUBKEY_R(i + 5) = SUBKEY_L(i + 5) ^ dw; SUBKEY_L(i + 5) = dw;
                i += 8;
        } while (i < max);
                SUBKEY_R(i + 5) = SUBKEY_L(i + 5) ^ dw; SUBKEY_L(i + 5) = dw;
                i += 8;
        } while (i < max);

-@@ -599,10 +587,10 @@
+@@ -599,10 +587,10 @@ static void camellia_setup128(const unsi

        /**
         *  k == kll || klr || krl || krr (|| is concatenation)
         */
        /**
         *  k == kll || klr || krl || krr (|| is concatenation)
         */


@@ -523,7 +523,7 @@
  
        /* generate KL dependent subkeys */
        /* kw1 */
  
        /* generate KL dependent subkeys */
        /* kw1 */

-@@ -707,14 +695,14 @@
+@@ -707,14 +695,14 @@ static void camellia_setup256(const unsi

         *  key = (kll || klr || krl || krr || krll || krlr || krrl || krrr)
         *  (|| is concatenation)
         */
         *  key = (kll || klr || krl || krr || krll || krlr || krrl || krrr)
         *  (|| is concatenation)
         */


@@ -546,7 +546,7 @@
  
        /* generate KL dependent subkeys */
        /* kw1 */
  
        /* generate KL dependent subkeys */
        /* kw1 */

-@@ -870,13 +858,13 @@
+@@ -870,13 +858,13 @@ static void camellia_setup192(const unsi

        t0 &= ll;                                                       \
        t2 |= rr;                                                       \
        rl ^= t2;                                                       \
        t0 &= ll;                                                       \
        t2 |= rr;                                                       \
        rl ^= t2;                                                       \


@@ -562,7 +562,7 @@
      } while(0)
  
  #define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir)              \
      } while(0)
  
  #define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir)              \

-@@ -892,7 +880,7 @@
+@@ -892,7 +880,7 @@ static void camellia_setup192(const unsi

        il ^= kl;                                                       \
        ir ^= il ^ kr;                                                  \
        yl ^= ir;                                                       \
        il ^= kl;                                                       \
        ir ^= il ^ kr;                                                  \
        yl ^= ir;                                                       \


@@ -605,7 +605,7 @@
  #define CHKSUM_DIGEST_SIZE    4
  
  struct chksum_ctx {
  #define CHKSUM_DIGEST_SIZE    4
  
  struct chksum_ctx {

-@@ -27,7 +30,7 @@
+@@ -27,7 +30,7 @@ struct chksum_ctx {

  };
  
  /*
  };
  
  /*


@@ -614,7 +614,7 @@
   * crc using table.
   */
  
   * crc using table.
   */
  

-@@ -67,11 +70,11 @@
+@@ -67,11 +70,11 @@ static void chksum_update(struct crypto_

  static void chksum_final(struct crypto_tfm *tfm, u8 *out)
  {
        struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
  static void chksum_final(struct crypto_tfm *tfm, u8 *out)
  {
        struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);


@@ -628,7 +628,7 @@
  {
        struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
  
  {
        struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
  

-@@ -79,14 +82,14 @@
+@@ -79,14 +82,14 @@ static int crc32c_cra_init(struct crypto

        return 0;
  }
  
        return 0;
  }
  


@@ -646,7 +646,7 @@
        .cra_u          =       {
                .digest = {
                         .dia_digestsize=       CHKSUM_DIGEST_SIZE,
        .cra_u          =       {
                .digest = {
                         .dia_digestsize=       CHKSUM_DIGEST_SIZE,

-@@ -98,14 +101,125 @@
+@@ -98,14 +101,125 @@ static struct crypto_alg alg = {

        }
  };
  
        }
  };
  


@@ -783,7 +783,7 @@
  #include <linux/err.h>
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/err.h>
  #include <linux/init.h>
  #include <linux/kernel.h>

-@@ -45,6 +46,13 @@
+@@ -45,6 +46,13 @@ struct cryptd_blkcipher_request_ctx {

        crypto_completion_t complete;
  };
  
        crypto_completion_t complete;
  };
  


@@ -797,7 +797,7 @@
  
  static inline struct cryptd_state *cryptd_get_state(struct crypto_tfm *tfm)
  {
  
  static inline struct cryptd_state *cryptd_get_state(struct crypto_tfm *tfm)
  {

-@@ -82,10 +90,8 @@
+@@ -82,10 +90,8 @@ static void cryptd_blkcipher_crypt(struc

  
        rctx = ablkcipher_request_ctx(req);
  
  
        rctx = ablkcipher_request_ctx(req);
  


@@ -810,7 +810,7 @@
  
        desc.tfm = child;
        desc.info = req->info;
  
        desc.tfm = child;
        desc.info = req->info;

-@@ -95,8 +101,9 @@
+@@ -95,8 +101,9 @@ static void cryptd_blkcipher_crypt(struc

  
        req->base.complete = rctx->complete;
  
  
        req->base.complete = rctx->complete;
  


@@ -821,7 +821,7 @@
        local_bh_enable();
  }
  
        local_bh_enable();
  }
  

-@@ -261,6 +268,240 @@
+@@ -261,6 +268,240 @@ out_put_alg:

        return inst;
  }
  
        return inst;
  }
  


@@ -1062,7 +1062,7 @@
  static struct cryptd_state state;
  
  static struct crypto_instance *cryptd_alloc(struct rtattr **tb)
  static struct cryptd_state state;
  
  static struct crypto_instance *cryptd_alloc(struct rtattr **tb)

-@@ -274,6 +515,8 @@
+@@ -274,6 +515,8 @@ static struct crypto_instance *cryptd_al

        switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
        case CRYPTO_ALG_TYPE_BLKCIPHER:
                return cryptd_alloc_blkcipher(tb, &state);
        switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
        case CRYPTO_ALG_TYPE_BLKCIPHER:
                return cryptd_alloc_blkcipher(tb, &state);


@@ -1081,7 +1081,7 @@
  #include <crypto/scatterwalk.h>
  #include <linux/mm.h>
  #include <linux/errno.h>
  #include <crypto/scatterwalk.h>
  #include <linux/mm.h>
  #include <linux/errno.h>

-@@ -141,7 +142,7 @@
+@@ -141,7 +142,7 @@ int crypto_init_digest_ops(struct crypto

        struct hash_tfm *ops = &tfm->crt_hash;
        struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
  
        struct hash_tfm *ops = &tfm->crt_hash;
        struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
  


@@ -1090,7 +1090,7 @@
                return -EINVAL;
        
        ops->init       = init;
                return -EINVAL;
        
        ops->init       = init;

-@@ -157,3 +158,83 @@
+@@ -157,3 +158,83 @@ int crypto_init_digest_ops(struct crypto

  void crypto_exit_digest_ops(struct crypto_tfm *tfm)
  {
  }
  void crypto_exit_digest_ops(struct crypto_tfm *tfm)
  {
  }


@@ -1184,7 +1184,7 @@
  #include <linux/errno.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/errno.h>
  #include <linux/kernel.h>
  #include <linux/module.h>

-@@ -59,24 +60,107 @@
+@@ -59,24 +60,107 @@ static int hash_setkey(struct crypto_has

        return alg->setkey(crt, key, keylen);
  }
  
        return alg->setkey(crt, key, keylen);
  }
  


@@ -1303,7 +1303,7 @@
  static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
 --- a/crypto/hmac.c
 +++ b/crypto/hmac.c
  static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
 --- a/crypto/hmac.c
 +++ b/crypto/hmac.c

-@@ -226,6 +226,7 @@
+@@ -226,6 +226,7 @@ static struct crypto_instance *hmac_allo

        struct crypto_instance *inst;
        struct crypto_alg *alg;
        int err;
        struct crypto_instance *inst;
        struct crypto_alg *alg;
        int err;


@@ -1311,7 +1311,7 @@
  
        err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);
        if (err)
  
        err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);
        if (err)

-@@ -236,6 +237,13 @@
+@@ -236,6 +237,13 @@ static struct crypto_instance *hmac_allo

        if (IS_ERR(alg))
                return ERR_CAST(alg);
  
        if (IS_ERR(alg))
                return ERR_CAST(alg);
  


@@ -1325,7 +1325,7 @@
        inst = crypto_alloc_instance("hmac", alg);
        if (IS_ERR(inst))
                goto out_put_alg;
        inst = crypto_alloc_instance("hmac", alg);
        if (IS_ERR(inst))
                goto out_put_alg;

-@@ -246,14 +254,10 @@
+@@ -246,14 +254,10 @@ static struct crypto_instance *hmac_allo

        inst->alg.cra_alignmask = alg->cra_alignmask;
        inst->alg.cra_type = &crypto_hash_type;
  
        inst->alg.cra_alignmask = alg->cra_alignmask;
        inst->alg.cra_type = &crypto_hash_type;
  


@@ -1344,7 +1344,7 @@
        inst->alg.cra_init = hmac_init_tfm;
 --- a/crypto/internal.h
 +++ b/crypto/internal.h
        inst->alg.cra_init = hmac_init_tfm;
 --- a/crypto/internal.h
 +++ b/crypto/internal.h

-@@ -86,6 +86,7 @@
+@@ -86,6 +86,7 @@ struct crypto_alg *__crypto_alg_lookup(c

  struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask);
  
  int crypto_init_digest_ops(struct crypto_tfm *tfm);
  struct crypto_alg *crypto_alg_mod_lookup(const char *name, u32 type, u32 mask);
  
  int crypto_init_digest_ops(struct crypto_tfm *tfm);


@@ -3329,7 +3329,7 @@
  #define IDX2          32400
  #define IDX3          1
  #define IDX4          8193
  #define IDX2          32400
  #define IDX3          1
  #define IDX4          8193

-@@ -83,7 +76,8 @@
+@@ -83,7 +76,8 @@ static char *check[] = {

        "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes",
        "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
        "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta",  "fcrypt",
        "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes",
        "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
        "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta",  "fcrypt",


@@ -3339,7 +3339,7 @@
  };
  
  static void hexdump(unsigned char *buf, unsigned int len)
  };
  
  static void hexdump(unsigned char *buf, unsigned int len)

-@@ -110,22 +104,30 @@
+@@ -110,22 +104,30 @@ static void test_hash(char *algo, struct

        unsigned int i, j, k, temp;
        struct scatterlist sg[8];
        char result[64];
        unsigned int i, j, k, temp;
        struct scatterlist sg[8];
        char result[64];


@@ -3375,7 +3375,7 @@
  
        for (i = 0; i < tcount; i++) {
                printk("test %u:\n", i + 1);
  
        for (i = 0; i < tcount; i++) {
                printk("test %u:\n", i + 1);

-@@ -139,8 +141,9 @@
+@@ -139,8 +141,9 @@ static void test_hash(char *algo, struct

                sg_init_one(&sg[0], hash_buff, template[i].psize);
  
                if (template[i].ksize) {
                sg_init_one(&sg[0], hash_buff, template[i].psize);
  
                if (template[i].ksize) {


@@ -3387,7 +3387,7 @@
                        if (ret) {
                                printk("setkey() failed ret=%d\n", ret);
                                kfree(hash_buff);
                        if (ret) {
                                printk("setkey() failed ret=%d\n", ret);
                                kfree(hash_buff);

-@@ -148,17 +151,30 @@
+@@ -148,17 +151,30 @@ static void test_hash(char *algo, struct

                        }
                }
  
                        }
                }
  


@@ -3422,7 +3422,7 @@
                       "fail" : "pass");
                kfree(hash_buff);
        }
                       "fail" : "pass");
                kfree(hash_buff);
        }

-@@ -187,8 +203,9 @@
+@@ -187,8 +203,9 @@ static void test_hash(char *algo, struct

                        }
  
                        if (template[i].ksize) {
                        }
  
                        if (template[i].ksize) {


@@ -3434,7 +3434,7 @@
  
                                if (ret) {
                                        printk("setkey() failed ret=%d\n", ret);
  
                                if (ret) {
                                        printk("setkey() failed ret=%d\n", ret);

-@@ -196,29 +213,44 @@
+@@ -196,29 +213,44 @@ static void test_hash(char *algo, struct

                                }
                        }
  
                                }
                        }
  


@@ -3486,7 +3486,7 @@
        char *q;
        struct crypto_aead *tfm;
        char *key;
        char *q;
        struct crypto_aead *tfm;
        char *key;

-@@ -344,13 +376,12 @@
+@@ -344,13 +376,12 @@ static void test_aead(char *algo, int en

                                goto next_one;
                        }
  
                                goto next_one;
                        }
  


@@ -3501,7 +3501,7 @@
  next_one:
                        if (!template[i].key)
                                kfree(key);
  next_one:
                        if (!template[i].key)
                                kfree(key);

-@@ -360,7 +391,6 @@
+@@ -360,7 +391,6 @@ next_one:

        }
  
        printk(KERN_INFO "\ntesting %s %s across pages (chunking)\n", algo, e);
        }
  
        printk(KERN_INFO "\ntesting %s %s across pages (chunking)\n", algo, e);


@@ -3509,7 +3509,7 @@
        memset(axbuf, 0, XBUFSIZE);
  
        for (i = 0, j = 0; i < tcount; i++) {
        memset(axbuf, 0, XBUFSIZE);
  
        for (i = 0, j = 0; i < tcount; i++) {

-@@ -388,6 +418,7 @@
+@@ -388,6 +418,7 @@ next_one:

                                        goto out;
                        }
  
                                        goto out;
                        }
  


@@ -3517,7 +3517,7 @@
                        sg_init_table(sg, template[i].np);
                        for (k = 0, temp = 0; k < template[i].np; k++) {
                                memcpy(&xbuf[IDX[k]],
                        sg_init_table(sg, template[i].np);
                        for (k = 0, temp = 0; k < template[i].np; k++) {
                                memcpy(&xbuf[IDX[k]],

-@@ -450,7 +481,7 @@
+@@ -450,7 +481,7 @@ next_one:

  
                        for (k = 0, temp = 0; k < template[i].np; k++) {
                                printk(KERN_INFO "page %u\n", k);
  
                        for (k = 0, temp = 0; k < template[i].np; k++) {
                                printk(KERN_INFO "page %u\n", k);


@@ -3526,7 +3526,7 @@
                                hexdump(q, template[i].tap[k]);
                                printk(KERN_INFO "%s\n",
                                       memcmp(q, template[i].result + temp,
                                hexdump(q, template[i].tap[k]);
                                printk(KERN_INFO "%s\n",
                                       memcmp(q, template[i].result + temp,

-@@ -459,8 +490,15 @@
+@@ -459,8 +490,15 @@ next_one:

                                               0 : authsize)) ?
                                       "fail" : "pass");
  
                                               0 : authsize)) ?
                                       "fail" : "pass");
  


@@ -3543,7 +3543,7 @@
                        }
                }
        }
                        }
                }
        }

-@@ -473,7 +511,7 @@
+@@ -473,7 +511,7 @@ out:

  static void test_cipher(char *algo, int enc,
                        struct cipher_testvec *template, unsigned int tcount)
  {
  static void test_cipher(char *algo, int enc,
                        struct cipher_testvec *template, unsigned int tcount)
  {


@@ -3552,7 +3552,7 @@
        char *q;
        struct crypto_ablkcipher *tfm;
        struct ablkcipher_request *req;
        char *q;
        struct crypto_ablkcipher *tfm;
        struct ablkcipher_request *req;

-@@ -569,19 +607,17 @@
+@@ -569,19 +607,17 @@ static void test_cipher(char *algo, int 

                                goto out;
                        }
  
                                goto out;
                        }
  


@@ -3573,7 +3573,7 @@
  
        j = 0;
        for (i = 0; i < tcount; i++) {
  
        j = 0;
        for (i = 0; i < tcount; i++) {

-@@ -596,6 +632,7 @@
+@@ -596,6 +632,7 @@ static void test_cipher(char *algo, int 

                        printk("test %u (%d bit key):\n",
                        j, template[i].klen * 8);
  
                        printk("test %u (%d bit key):\n",
                        j, template[i].klen * 8);
  


@@ -3581,7 +3581,7 @@
                        crypto_ablkcipher_clear_flags(tfm, ~0);
                        if (template[i].wk)
                                crypto_ablkcipher_set_flags(
                        crypto_ablkcipher_clear_flags(tfm, ~0);
                        if (template[i].wk)
                                crypto_ablkcipher_set_flags(

-@@ -649,14 +686,21 @@
+@@ -649,14 +686,21 @@ static void test_cipher(char *algo, int 

                        temp = 0;
                        for (k = 0; k < template[i].np; k++) {
                                printk("page %u\n", k);
                        temp = 0;
                        for (k = 0; k < template[i].np; k++) {
                                printk("page %u\n", k);


@@ -3605,7 +3605,7 @@
                        }
                }
        }
                        }
                }
        }

-@@ -1172,6 +1216,14 @@
+@@ -1172,6 +1216,14 @@ static void do_test(void)

                test_cipher("ecb(des3_ede)", DECRYPT, des3_ede_dec_tv_template,
                            DES3_EDE_DEC_TEST_VECTORS);
  
                test_cipher("ecb(des3_ede)", DECRYPT, des3_ede_dec_tv_template,
                            DES3_EDE_DEC_TEST_VECTORS);
  


@@ -3620,7 +3620,7 @@
                test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);
  
                test_hash("sha224", sha224_tv_template, SHA224_TEST_VECTORS);
                test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);
  
                test_hash("sha224", sha224_tv_template, SHA224_TEST_VECTORS);

-@@ -1382,6 +1434,14 @@
+@@ -1382,6 +1434,14 @@ static void do_test(void)

                            DES3_EDE_ENC_TEST_VECTORS);
                test_cipher("ecb(des3_ede)", DECRYPT, des3_ede_dec_tv_template,
                            DES3_EDE_DEC_TEST_VECTORS);
                            DES3_EDE_ENC_TEST_VECTORS);
                test_cipher("ecb(des3_ede)", DECRYPT, des3_ede_dec_tv_template,
                            DES3_EDE_DEC_TEST_VECTORS);


@@ -3635,7 +3635,7 @@
                break;
  
        case 5:
                break;
  
        case 5:

-@@ -1550,7 +1610,7 @@
+@@ -1550,7 +1610,7 @@ static void do_test(void)

        case 29:
                test_hash("tgr128", tgr128_tv_template, TGR128_TEST_VECTORS);
                break;
        case 29:
                test_hash("tgr128", tgr128_tv_template, TGR128_TEST_VECTORS);
                break;


@@ -3644,7 +3644,7 @@
        case 30:
                test_cipher("ecb(xeta)", ENCRYPT, xeta_enc_tv_template,
                            XETA_ENC_TEST_VECTORS);
        case 30:
                test_cipher("ecb(xeta)", ENCRYPT, xeta_enc_tv_template,
                            XETA_ENC_TEST_VECTORS);

-@@ -1615,6 +1675,22 @@
+@@ -1615,6 +1675,22 @@ static void do_test(void)

                            CTS_MODE_DEC_TEST_VECTORS);
                break;
  
                            CTS_MODE_DEC_TEST_VECTORS);
                break;
  


@@ -3667,7 +3667,7 @@
        case 100:
                test_hash("hmac(md5)", hmac_md5_tv_template,
                          HMAC_MD5_TEST_VECTORS);
        case 100:
                test_hash("hmac(md5)", hmac_md5_tv_template,
                          HMAC_MD5_TEST_VECTORS);

-@@ -1650,6 +1726,16 @@
+@@ -1650,6 +1726,16 @@ static void do_test(void)

                          XCBC_AES_TEST_VECTORS);
                break;
  
                          XCBC_AES_TEST_VECTORS);
                break;
  


@@ -3684,7 +3684,7 @@
        case 200:
                test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
        case 200:
                test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
                                speed_template_16_24_32);

-@@ -1788,6 +1874,22 @@
+@@ -1788,6 +1874,22 @@ static void do_test(void)

                test_hash_speed("sha224", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;
  
                test_hash_speed("sha224", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;
  


@@ -3722,7 +3722,7 @@
   */
  #ifndef _CRYPTO_TCRYPT_H
  #define _CRYPTO_TCRYPT_H
   */
  #ifndef _CRYPTO_TCRYPT_H
  #define _CRYPTO_TCRYPT_H

-@@ -168,6 +162,271 @@
+@@ -168,6 +162,271 @@ static struct hash_testvec md5_tv_templa

                .digest = "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55"
                          "\xac\x49\xda\x2e\x21\x07\xb6\x7a",
        }
                .digest = "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55"
                          "\xac\x49\xda\x2e\x21\x07\xb6\x7a",
        }


@@ -3994,7 +3994,7 @@
  };
  
  /*
  };
  
  /*

-@@ -817,6 +1076,168 @@
+@@ -817,6 +1076,168 @@ static struct hash_testvec hmac_md5_tv_t

  };
  
  /*
  };
  
  /*


@@ -4163,7 +4163,7 @@
   * HMAC-SHA1 test vectors from RFC2202
   */
  #define HMAC_SHA1_TEST_VECTORS        7
   * HMAC-SHA1 test vectors from RFC2202
   */
  #define HMAC_SHA1_TEST_VECTORS        7

-@@ -1442,6 +1863,8 @@
+@@ -1442,6 +1863,8 @@ static struct hash_testvec hmac_sha512_t

  #define DES_CBC_DEC_TEST_VECTORS      4
  #define DES3_EDE_ENC_TEST_VECTORS     3
  #define DES3_EDE_DEC_TEST_VECTORS     3
  #define DES_CBC_DEC_TEST_VECTORS      4
  #define DES3_EDE_ENC_TEST_VECTORS     3
  #define DES3_EDE_DEC_TEST_VECTORS     3


@@ -4172,7 +4172,7 @@
  
  static struct cipher_testvec des_enc_tv_template[] = {
        { /* From Applied Cryptography */
  
  static struct cipher_testvec des_enc_tv_template[] = {
        { /* From Applied Cryptography */

-@@ -1680,9 +2103,6 @@
+@@ -1680,9 +2103,6 @@ static struct cipher_testvec des_cbc_dec

        },
  };
  
        },
  };
  


@@ -4182,7 +4182,7 @@
  static struct cipher_testvec des3_ede_enc_tv_template[] = {
        { /* These are from openssl */
                .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
  static struct cipher_testvec des3_ede_enc_tv_template[] = {
        { /* These are from openssl */
                .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"

-@@ -1745,6 +2165,94 @@
+@@ -1745,6 +2165,94 @@ static struct cipher_testvec des3_ede_de

        },
  };
  
        },
  };
  


@@ -4279,7 +4279,7 @@
   */
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
   */
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig

-@@ -174,4 +174,30 @@
+@@ -174,4 +174,30 @@ config CRYPTO_DEV_HIFN_795X_RNG

          Select this option if you want to enable the random number generator
          on the HIFN 795x crypto adapters.
  
          Select this option if you want to enable the random number generator
          on the HIFN 795x crypto adapters.
  


@@ -4312,7 +4312,7 @@
  endif # CRYPTO_HW
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile
  endif # CRYPTO_HW
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile

-@@ -2,3 +2,5 @@
+@@ -2,3 +2,5 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += 

  obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
  obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
  obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
  obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
  obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
  obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o


@@ -4328,7 +4328,7 @@
  #include <linux/crypto.h>
  #include <linux/hw_random.h>
  #include <linux/ktime.h>
  #include <linux/crypto.h>
  #include <linux/hw_random.h>
  #include <linux/ktime.h>

-@@ -369,7 +368,9 @@
+@@ -369,7 +368,9 @@ static atomic_t hifn_dev_number;

  #define       HIFN_D_DST_RSIZE                80*4
  #define       HIFN_D_RES_RSIZE                24*4
  
  #define       HIFN_D_DST_RSIZE                80*4
  #define       HIFN_D_RES_RSIZE                24*4
  


@@ -4339,7 +4339,7 @@
  
  #define AES_MIN_KEY_SIZE              16
  #define AES_MAX_KEY_SIZE              32
  
  #define AES_MIN_KEY_SIZE              16
  #define AES_MAX_KEY_SIZE              32

-@@ -535,10 +536,10 @@
+@@ -535,10 +536,10 @@ struct hifn_crypt_command

   */
  struct hifn_mac_command
  {
   */
  struct hifn_mac_command
  {


@@ -4354,7 +4354,7 @@
  };
  
  #define       HIFN_MAC_CMD_ALG_MASK           0x0001
  };
  
  #define       HIFN_MAC_CMD_ALG_MASK           0x0001

-@@ -564,10 +565,10 @@
+@@ -564,10 +565,10 @@ struct hifn_mac_command

  
  struct hifn_comp_command
  {
  
  struct hifn_comp_command
  {


@@ -4369,7 +4369,7 @@
  };
  
  #define       HIFN_COMP_CMD_SRCLEN_M          0xc000
  };
  
  #define       HIFN_COMP_CMD_SRCLEN_M          0xc000

-@@ -583,10 +584,10 @@
+@@ -583,10 +584,10 @@ struct hifn_comp_command

  
  struct hifn_base_result
  {
  
  struct hifn_base_result
  {


@@ -4384,7 +4384,7 @@
  };
  
  #define       HIFN_BASE_RES_DSTOVERRUN        0x0200  /* destination overrun */
  };
  
  #define       HIFN_BASE_RES_DSTOVERRUN        0x0200  /* destination overrun */

-@@ -597,8 +598,8 @@
+@@ -597,8 +598,8 @@ struct hifn_base_result

  
  struct hifn_comp_result
  {
  
  struct hifn_comp_result
  {


@@ -4395,7 +4395,7 @@
  };
  
  #define       HIFN_COMP_RES_LCB_M             0xff00  /* longitudinal check byte */
  };
  
  #define       HIFN_COMP_RES_LCB_M             0xff00  /* longitudinal check byte */

-@@ -609,8 +610,8 @@
+@@ -609,8 +610,8 @@ struct hifn_comp_result

  
  struct hifn_mac_result
  {
  
  struct hifn_mac_result
  {


@@ -4406,7 +4406,7 @@
        /* followed by 0, 6, 8, or 10 u16's of the MAC, then crypt */
  };
  
        /* followed by 0, 6, 8, or 10 u16's of the MAC, then crypt */
  };
  

-@@ -619,8 +620,8 @@
+@@ -619,8 +620,8 @@ struct hifn_mac_result

  
  struct hifn_crypt_result
  {
  
  struct hifn_crypt_result
  {


@@ -4417,7 +4417,7 @@
  };
  
  #define       HIFN_CRYPT_RES_SRC_NOTZERO      0x0001  /* source expired */
  };
  
  #define       HIFN_CRYPT_RES_SRC_NOTZERO      0x0001  /* source expired */

-@@ -686,12 +687,12 @@
+@@ -686,12 +687,12 @@ static inline u32 hifn_read_1(struct hif

  
  static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
  {
  
  static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
  {


@@ -4432,7 +4432,7 @@
  }
  
  static void hifn_wait_puc(struct hifn_device *dev)
  }
  
  static void hifn_wait_puc(struct hifn_device *dev)

-@@ -894,7 +895,7 @@
+@@ -894,7 +895,7 @@ static int hifn_enable_crypto(struct hif

        char *offtbl = NULL;
        int i;
  
        char *offtbl = NULL;
        int i;
  


@@ -4441,7 +4441,7 @@
                if (pci2id[i].pci_vendor == dev->pdev->vendor &&
                                pci2id[i].pci_prod == dev->pdev->device) {
                        offtbl = pci2id[i].card_id;
                if (pci2id[i].pci_vendor == dev->pdev->vendor &&
                                pci2id[i].pci_prod == dev->pdev->device) {
                        offtbl = pci2id[i].card_id;

-@@ -1037,14 +1038,14 @@
+@@ -1037,14 +1038,14 @@ static void hifn_init_registers(struct h

        hifn_write_0(dev, HIFN_0_PUIER, HIFN_PUIER_DSTOVER);
  
        /* write all 4 ring address registers */
        hifn_write_0(dev, HIFN_0_PUIER, HIFN_PUIER_DSTOVER);
  
        /* write all 4 ring address registers */


@@ -4464,7 +4464,7 @@
  
        mdelay(2);
  #if 0
  
        mdelay(2);
  #if 0

-@@ -1166,109 +1167,15 @@
+@@ -1166,109 +1167,15 @@ static int hifn_setup_crypto_command(str

        return cmd_len;
  }
  
        return cmd_len;
  }
  


@@ -4577,7 +4577,7 @@
        buf_pos = buf = dma->command_bufs[dma->cmdi];
  
        mask = 0;
        buf_pos = buf = dma->command_bufs[dma->cmdi];
  
        mask = 0;

-@@ -1370,16 +1277,113 @@
+@@ -1370,16 +1277,113 @@ static int hifn_setup_dma(struct hifn_de

                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_C_CTRL_ENA);
                dev->flags |= HIFN_FLAG_CMD_BUSY;
        }
                hifn_write_1(dev, HIFN_1_DMA_CSR, HIFN_DMACSR_C_CTRL_ENA);
                dev->flags |= HIFN_FLAG_CMD_BUSY;
        }


@@ -4695,7 +4695,7 @@
  static int ablkcipher_walk_init(struct ablkcipher_walk *w,
                int num, gfp_t gfp_flags)
  {
  static int ablkcipher_walk_init(struct ablkcipher_walk *w,
                int num, gfp_t gfp_flags)
  {

-@@ -1431,7 +1435,7 @@
+@@ -1431,7 +1435,7 @@ static int ablkcipher_add(void *daddr, u

                return -EINVAL;
  
        while (size) {
                return -EINVAL;
  
        while (size) {


@@ -4704,7 +4704,7 @@
  
                saddr = kmap_atomic(sg_page(src), KM_SOFTIRQ1);
                memcpy(daddr, saddr + src->offset, copy);
  
                saddr = kmap_atomic(sg_page(src), KM_SOFTIRQ1);
                memcpy(daddr, saddr + src->offset, copy);

-@@ -1458,10 +1462,6 @@
+@@ -1458,10 +1462,6 @@ static int ablkcipher_add(void *daddr, u

  static int ablkcipher_walk(struct ablkcipher_request *req,
                struct ablkcipher_walk *w)
  {
  static int ablkcipher_walk(struct ablkcipher_request *req,
                struct ablkcipher_walk *w)
  {


@@ -4715,7 +4715,7 @@
        struct scatterlist *src, *dst, *t;
        void *daddr;
        unsigned int nbytes = req->nbytes, offset, copy, diff;
        struct scatterlist *src, *dst, *t;
        void *daddr;
        unsigned int nbytes = req->nbytes, offset, copy, diff;

-@@ -1477,16 +1477,14 @@
+@@ -1477,16 +1477,14 @@ static int ablkcipher_walk(struct ablkci

                dst = &req->dst[idx];
  
                dprintk("\n%s: slen: %u, dlen: %u, soff: %u, doff: %u, offset: %u, "
                dst = &req->dst[idx];
  
                dprintk("\n%s: slen: %u, dlen: %u, soff: %u, doff: %u, offset: %u, "


@@ -4738,7 +4738,7 @@
                        unsigned dlen = PAGE_SIZE;
  
                        t = &w->cache[idx];
                        unsigned dlen = PAGE_SIZE;
  
                        t = &w->cache[idx];

-@@ -1498,8 +1496,8 @@
+@@ -1498,8 +1496,8 @@ static int ablkcipher_walk(struct ablkci

  
                        idx += err;
  
  
                        idx += err;
  


@@ -4749,7 +4749,7 @@
  
                        if (dlen < nbytes) {
                                /*
  
                        if (dlen < nbytes) {
                                /*

-@@ -1507,7 +1505,7 @@
+@@ -1507,7 +1505,7 @@ static int ablkcipher_walk(struct ablkci

                                 * to put there additional blocksized chunk,
                                 * so we mark that page as containing only
                                 * blocksize aligned chunks:
                                 * to put there additional blocksized chunk,
                                 * so we mark that page as containing only
                                 * blocksize aligned chunks:


@@ -4758,7 +4758,7 @@
                                 * and increase number of bytes to be processed
                                 * in next chunk:
                                 *      nbytes += diff;
                                 * and increase number of bytes to be processed
                                 * in next chunk:
                                 *      nbytes += diff;

-@@ -1544,7 +1542,7 @@
+@@ -1544,7 +1542,7 @@ static int ablkcipher_walk(struct ablkci

  
                        kunmap_atomic(daddr, KM_SOFTIRQ0);
                } else {
  
                        kunmap_atomic(daddr, KM_SOFTIRQ0);
                } else {


@@ -4767,7 +4767,7 @@
                        idx++;
                }
  
                        idx++;
                }
  

-@@ -1563,14 +1561,10 @@
+@@ -1563,14 +1561,10 @@ static int hifn_setup_session(struct abl

        struct hifn_context *ctx = crypto_tfm_ctx(req->base.tfm);
        struct hifn_device *dev = ctx->dev;
        struct page *spage, *dpage;
        struct hifn_context *ctx = crypto_tfm_ctx(req->base.tfm);
        struct hifn_device *dev = ctx->dev;
        struct page *spage, *dpage;


@@ -4783,7 +4783,7 @@
  
        if (ctx->iv && !ctx->ivsize && ctx->mode != ACRYPTO_MODE_ECB)
                goto err_out_exit;
  
        if (ctx->iv && !ctx->ivsize && ctx->mode != ACRYPTO_MODE_ECB)
                goto err_out_exit;

-@@ -1578,17 +1572,14 @@
+@@ -1578,17 +1572,14 @@ static int hifn_setup_session(struct abl

        ctx->walk.flags = 0;
  
        while (nbytes) {
        ctx->walk.flags = 0;
  
        while (nbytes) {


@@ -4805,7 +4805,7 @@
                idx++;
        }
  
                idx++;
        }
  

-@@ -1602,7 +1593,10 @@
+@@ -1602,7 +1593,10 @@ static int hifn_setup_session(struct abl

        idx = 0;
  
        sg_num = ablkcipher_walk(req, &ctx->walk);
        idx = 0;
  
        sg_num = ablkcipher_walk(req, &ctx->walk);


@@ -4817,7 +4817,7 @@
        atomic_set(&ctx->sg_num, sg_num);
  
        spin_lock_irqsave(&dev->lock, flags);
        atomic_set(&ctx->sg_num, sg_num);
  
        spin_lock_irqsave(&dev->lock, flags);

-@@ -1640,7 +1634,7 @@
+@@ -1640,7 +1634,7 @@ static int hifn_setup_session(struct abl

                if (err)
                        goto err_out;
  
                if (err)
                        goto err_out;
  


@@ -4826,7 +4826,7 @@
        }
  
        dev->active = HIFN_DEFAULT_ACTIVE_NUM;
        }
  
        dev->active = HIFN_DEFAULT_ACTIVE_NUM;

-@@ -1651,7 +1645,7 @@
+@@ -1651,7 +1645,7 @@ static int hifn_setup_session(struct abl

  err_out:
        spin_unlock_irqrestore(&dev->lock, flags);
  err_out_exit:
  err_out:
        spin_unlock_irqrestore(&dev->lock, flags);
  err_out_exit:


@@ -4835,7 +4835,7 @@
                dprintk("%s: iv: %p [%d], key: %p [%d], mode: %u, op: %u, "
                                "type: %u, err: %d.\n",
                        dev->name, ctx->iv, ctx->ivsize,
                dprintk("%s: iv: %p [%d], key: %p [%d], mode: %u, op: %u, "
                                "type: %u, err: %d.\n",
                        dev->name, ctx->iv, ctx->ivsize,

-@@ -1745,8 +1739,7 @@
+@@ -1745,8 +1739,7 @@ static int ablkcipher_get(void *saddr, u

                return -EINVAL;
  
        while (size) {
                return -EINVAL;
  
        while (size) {


@@ -4845,7 +4845,7 @@
  
                daddr = kmap_atomic(sg_page(dst), KM_IRQ0);
                memcpy(daddr + dst->offset + offset, saddr, copy);
  
                daddr = kmap_atomic(sg_page(dst), KM_IRQ0);
                memcpy(daddr + dst->offset + offset, saddr, copy);

-@@ -1803,7 +1796,7 @@
+@@ -1803,7 +1796,7 @@ static void hifn_process_ready(struct ab

                                        sg_page(dst), dst->length, nbytes);
  
                                if (!t->length) {
                                        sg_page(dst), dst->length, nbytes);
  
                                if (!t->length) {


@@ -4854,7 +4854,7 @@
                                        idx++;
                                        continue;
                                }
                                        idx++;
                                        continue;
                                }

-@@ -2202,9 +2195,9 @@
+@@ -2202,9 +2195,9 @@ static int hifn_setup_crypto(struct ablk

                return err;
  
        if (dev->started < HIFN_QUEUE_LENGTH && dev->queue.qlen)
                return err;
  
        if (dev->started < HIFN_QUEUE_LENGTH && dev->queue.qlen)


@@ -4866,7 +4866,7 @@
  }
  
  /*
  }
  
  /*

-@@ -2364,7 +2357,7 @@
+@@ -2364,7 +2357,7 @@ static struct hifn_alg_template hifn_alg

         * 3DES ECB, CBC, CFB and OFB modes.
         */
        {
         * 3DES ECB, CBC, CFB and OFB modes.
         */
        {


@@ -4875,7 +4875,7 @@
                .ablkcipher = {
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,
                .ablkcipher = {
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,

-@@ -2374,7 +2367,7 @@
+@@ -2374,7 +2367,7 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4884,7 +4884,7 @@
                .ablkcipher = {
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,
                .ablkcipher = {
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,

-@@ -2384,8 +2377,9 @@
+@@ -2384,8 +2377,9 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4895,7 +4895,7 @@
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .setkey         =       hifn_setkey,
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .setkey         =       hifn_setkey,

-@@ -2394,7 +2388,7 @@
+@@ -2394,7 +2388,7 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4904,7 +4904,7 @@
                .ablkcipher = {
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,
                .ablkcipher = {
                        .min_keysize    =       HIFN_3DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_3DES_KEY_LENGTH,

-@@ -2408,7 +2402,7 @@
+@@ -2408,7 +2402,7 @@ static struct hifn_alg_template hifn_alg

         * DES ECB, CBC, CFB and OFB modes.
         */
        {
         * DES ECB, CBC, CFB and OFB modes.
         */
        {


@@ -4913,7 +4913,7 @@
                .ablkcipher = {
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,
                .ablkcipher = {
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,

-@@ -2418,7 +2412,7 @@
+@@ -2418,7 +2412,7 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4922,7 +4922,7 @@
                .ablkcipher = {
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,
                .ablkcipher = {
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,

-@@ -2428,8 +2422,9 @@
+@@ -2428,8 +2422,9 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4933,7 +4933,7 @@
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,
                        .setkey         =       hifn_setkey,
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,
                        .setkey         =       hifn_setkey,

-@@ -2438,7 +2433,7 @@
+@@ -2438,7 +2433,7 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4942,7 +4942,7 @@
                .ablkcipher = {
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,
                .ablkcipher = {
                        .min_keysize    =       HIFN_DES_KEY_LENGTH,
                        .max_keysize    =       HIFN_DES_KEY_LENGTH,

-@@ -2452,7 +2447,7 @@
+@@ -2452,7 +2447,7 @@ static struct hifn_alg_template hifn_alg

         * AES ECB, CBC, CFB and OFB modes.
         */
        {
         * AES ECB, CBC, CFB and OFB modes.
         */
        {


@@ -4951,7 +4951,7 @@
                .ablkcipher = {
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,
                .ablkcipher = {
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,

-@@ -2462,8 +2457,9 @@
+@@ -2462,8 +2457,9 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4962,7 +4962,7 @@
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,
                        .setkey         =       hifn_setkey,
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,
                        .setkey         =       hifn_setkey,

-@@ -2472,7 +2468,7 @@
+@@ -2472,7 +2468,7 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4971,7 +4971,7 @@
                .ablkcipher = {
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,
                .ablkcipher = {
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,

-@@ -2482,7 +2478,7 @@
+@@ -2482,7 +2478,7 @@ static struct hifn_alg_template hifn_alg

                },
        },
        {
                },
        },
        {


@@ -4980,7 +4980,7 @@
                .ablkcipher = {
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,
                .ablkcipher = {
                        .min_keysize    =       AES_MIN_KEY_SIZE,
                        .max_keysize    =       AES_MAX_KEY_SIZE,

-@@ -2514,15 +2510,14 @@
+@@ -2514,15 +2510,14 @@ static int hifn_alg_alloc(struct hifn_de

                return -ENOMEM;
  
        snprintf(alg->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s", t->name);
                return -ENOMEM;
  
        snprintf(alg->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s", t->name);


@@ -6510,7 +6510,7 @@
 +
 --- a/drivers/crypto/padlock-aes.c
 +++ b/drivers/crypto/padlock-aes.c
 +
 --- a/drivers/crypto/padlock-aes.c
 +++ b/drivers/crypto/padlock-aes.c

-@@ -411,12 +411,12 @@
+@@ -411,12 +411,12 @@ static int __init padlock_init(void)

        int ret;
  
        if (!cpu_has_xcrypt) {
        int ret;
  
        if (!cpu_has_xcrypt) {


@@ -6527,7 +6527,7 @@
  
 --- a/drivers/crypto/padlock-sha.c
 +++ b/drivers/crypto/padlock-sha.c
  
 --- a/drivers/crypto/padlock-sha.c
 +++ b/drivers/crypto/padlock-sha.c

-@@ -263,12 +263,12 @@
+@@ -263,12 +263,12 @@ static int __init padlock_init(void)

        int rc = -ENODEV;
  
        if (!cpu_has_phe) {
        int rc = -ENODEV;
  
        if (!cpu_has_phe) {


@@ -8606,7 +8606,7 @@
  #define CRYPTO_ALG_TYPE_BLKCIPHER_MASK        0x0000000c
  
  #define CRYPTO_ALG_LARVAL             0x00000010
  #define CRYPTO_ALG_TYPE_BLKCIPHER_MASK        0x0000000c
  
  #define CRYPTO_ALG_LARVAL             0x00000010

-@@ -102,6 +104,7 @@
+@@ -102,6 +104,7 @@ struct crypto_async_request;

  struct crypto_aead;
  struct crypto_blkcipher;
  struct crypto_hash;
  struct crypto_aead;
  struct crypto_blkcipher;
  struct crypto_hash;


@@ -8614,7 +8614,7 @@
  struct crypto_tfm;
  struct crypto_type;
  struct aead_givcrypt_request;
  struct crypto_tfm;
  struct crypto_type;
  struct aead_givcrypt_request;

-@@ -131,6 +134,16 @@
+@@ -131,6 +134,16 @@ struct ablkcipher_request {

        void *__ctx[] CRYPTO_MINALIGN_ATTR;
  };
  
        void *__ctx[] CRYPTO_MINALIGN_ATTR;
  };
  


@@ -8631,7 +8631,7 @@
  /**
   *    struct aead_request - AEAD request
   *    @base: Common attributes for async crypto requests
  /**
   *    struct aead_request - AEAD request
   *    @base: Common attributes for async crypto requests

-@@ -195,6 +208,17 @@
+@@ -195,6 +208,17 @@ struct ablkcipher_alg {

        unsigned int ivsize;
  };
  
        unsigned int ivsize;
  };
  


@@ -8649,7 +8649,7 @@
  struct aead_alg {
        int (*setkey)(struct crypto_aead *tfm, const u8 *key,
                      unsigned int keylen);
  struct aead_alg {
        int (*setkey)(struct crypto_aead *tfm, const u8 *key,
                      unsigned int keylen);

-@@ -272,6 +296,7 @@
+@@ -272,6 +296,7 @@ struct compress_alg {

  #define cra_cipher    cra_u.cipher
  #define cra_digest    cra_u.digest
  #define cra_hash      cra_u.hash
  #define cra_cipher    cra_u.cipher
  #define cra_digest    cra_u.digest
  #define cra_hash      cra_u.hash


@@ -8657,7 +8657,7 @@
  #define cra_compress  cra_u.compress
  
  struct crypto_alg {
  #define cra_compress  cra_u.compress
  
  struct crypto_alg {

-@@ -298,6 +323,7 @@
+@@ -298,6 +323,7 @@ struct crypto_alg {

                struct cipher_alg cipher;
                struct digest_alg digest;
                struct hash_alg hash;
                struct cipher_alg cipher;
                struct digest_alg digest;
                struct hash_alg hash;


@@ -8665,7 +8665,7 @@
                struct compress_alg compress;
        } cra_u;
  
                struct compress_alg compress;
        } cra_u;
  

-@@ -383,6 +409,18 @@
+@@ -383,6 +409,18 @@ struct hash_tfm {

        unsigned int digestsize;
  };
  
        unsigned int digestsize;
  };
  


@@ -8684,7 +8684,7 @@
  struct compress_tfm {
        int (*cot_compress)(struct crypto_tfm *tfm,
                            const u8 *src, unsigned int slen,
  struct compress_tfm {
        int (*cot_compress)(struct crypto_tfm *tfm,
                            const u8 *src, unsigned int slen,

-@@ -397,6 +435,7 @@
+@@ -397,6 +435,7 @@ struct compress_tfm {

  #define crt_blkcipher crt_u.blkcipher
  #define crt_cipher    crt_u.cipher
  #define crt_hash      crt_u.hash
  #define crt_blkcipher crt_u.blkcipher
  #define crt_cipher    crt_u.cipher
  #define crt_hash      crt_u.hash


@@ -8692,7 +8692,7 @@
  #define crt_compress  crt_u.compress
  
  struct crypto_tfm {
  #define crt_compress  crt_u.compress
  
  struct crypto_tfm {

-@@ -409,6 +448,7 @@
+@@ -409,6 +448,7 @@ struct crypto_tfm {

                struct blkcipher_tfm blkcipher;
                struct cipher_tfm cipher;
                struct hash_tfm hash;
                struct blkcipher_tfm blkcipher;
                struct cipher_tfm cipher;
                struct hash_tfm hash;

diff --git a/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch b/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch
index e60ca2ea47409b5fd0257927dc43dabc7cebeacc..79843a14e3cad69fca7f40b018823df4a7bfc004 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/915-hso-backport.patch
@@ -28,7 +28,7 @@ Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
 
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
 
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -237,6 +237,7 @@
+@@ -237,6 +237,7 @@ obj-$(CONFIG_USB_CATC)          += usb/

  obj-$(CONFIG_USB_KAWETH)        += usb/
  obj-$(CONFIG_USB_PEGASUS)       += usb/
  obj-$(CONFIG_USB_RTL8150)       += usb/
  obj-$(CONFIG_USB_KAWETH)        += usb/
  obj-$(CONFIG_USB_PEGASUS)       += usb/
  obj-$(CONFIG_USB_RTL8150)       += usb/


@@ -38,7 +38,7 @@ Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  
 --- a/drivers/net/usb/Kconfig
 +++ b/drivers/net/usb/Kconfig
  
 --- a/drivers/net/usb/Kconfig
 +++ b/drivers/net/usb/Kconfig

-@@ -154,6 +154,16 @@
+@@ -154,6 +154,16 @@ config USB_NET_AX8817X

          This driver creates an interface named "ethX", where X depends on
          what other networking devices you have in use.
  
          This driver creates an interface named "ethX", where X depends on
          what other networking devices you have in use.
  


@@ -57,7 +57,7 @@ Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
        tristate "CDC Ethernet support (smart devices such as cable modems)"
 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile
        tristate "CDC Ethernet support (smart devices such as cable modems)"
 --- a/drivers/net/usb/Makefile
 +++ b/drivers/net/usb/Makefile

-@@ -6,6 +6,7 @@
+@@ -6,6 +6,7 @@ obj-$(CONFIG_USB_CATC)         += catc.o

  obj-$(CONFIG_USB_KAWETH)      += kaweth.o
  obj-$(CONFIG_USB_PEGASUS)     += pegasus.o
  obj-$(CONFIG_USB_RTL8150)     += rtl8150.o
  obj-$(CONFIG_USB_KAWETH)      += kaweth.o
  obj-$(CONFIG_USB_PEGASUS)     += pegasus.o
  obj-$(CONFIG_USB_RTL8150)     += rtl8150.o

diff --git a/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch
index 2457cbe4294403cb4261aaf7ec90e7f733718aa0..c70a3808d98b556be452cea802bfb777415211da 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch
@@ -330,7 +330,7 @@
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig

-@@ -100,6 +100,19 @@
+@@ -100,6 +100,19 @@ config SPI_BUTTERFLY

          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  


@@ -352,7 +352,7 @@
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile

-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.

  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
  obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o
  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
  obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o


@@ -362,7 +362,7 @@
  obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
  obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -3795,6 +3795,11 @@
+@@ -3795,6 +3795,11 @@ L:      cbe-oss-dev@ozlabs.org

  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.26/922-gpiommc.patch
index 2fb3a34c6beb0c5e8267449df654241feedf5df1..2293a5e8a31210cbd2e8a18aac46c028e39b95e2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/922-gpiommc.patch
@@ -611,7 +611,7 @@
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig

-@@ -130,3 +130,27 @@
+@@ -130,3 +130,27 @@ config MMC_SPI

  
          If unsure, or if your system has no SPI master driver, say N.
  
  
          If unsure, or if your system has no SPI master driver, say N.
  


@@ -641,7 +641,7 @@
 +        if configfs is available.
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
 +        if configfs is available.
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile

-@@ -17,4 +17,4 @@
+@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)               += omap.o

  obj-$(CONFIG_MMC_AT91)                += at91_mci.o
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
  obj-$(CONFIG_MMC_AT91)                += at91_mci.o
  obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
  obj-$(CONFIG_MMC_SPI)         += mmc_spi.o


@@ -823,7 +823,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -1818,6 +1818,11 @@
+@@ -1818,6 +1818,11 @@ L:      gigaset307x-common@lists.sourceforge.

  W:    http://gigaset307x.sourceforge.net/
  S:    Maintained
  
  W:    http://gigaset307x.sourceforge.net/
  S:    Maintained
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch b/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch
index 1d0f5ba65147ba6a7c29bbad1c8508d23789106d..2e4e820b2beb4361b60eb2cf6ca056e1b30e8fce 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/923-gpiommc-configfs-locking.patch
@@ -3,7 +3,7 @@ does not lock access between files.
 
 --- a/drivers/mmc/host/gpiommc.c
 +++ b/drivers/mmc/host/gpiommc.c
 
 --- a/drivers/mmc/host/gpiommc.c
 +++ b/drivers/mmc/host/gpiommc.c

-@@ -143,6 +143,8 @@
+@@ -143,6 +143,8 @@ struct gpiommc_configfs_device {

        struct platform_device *pdev;
        /* The configuration */
        struct gpiommc_platform_data pdata;
        struct platform_device *pdev;
        /* The configuration */
        struct gpiommc_platform_data pdata;


@@ -12,7 +12,7 @@ does not lock access between files.
  };
  
  #define GPIO_INVALID  -1
  };
  
  #define GPIO_INVALID  -1

-@@ -233,6 +235,8 @@
+@@ -233,6 +235,8 @@ static ssize_t gpiommc_config_attr_show(

        unsigned int gpio;
        int err = 0;
  
        unsigned int gpio;
        int err = 0;
  


@@ -21,7 +21,7 @@ does not lock access between files.
        if (attr == &gpiommc_attr_DI) {
                gpio = dev->pdata.pins.gpio_di;
                if (gpio == GPIO_INVALID)
        if (attr == &gpiommc_attr_DI) {
                gpio = dev->pdata.pins.gpio_di;
                if (gpio == GPIO_INVALID)

-@@ -293,6 +297,8 @@
+@@ -293,6 +297,8 @@ static ssize_t gpiommc_config_attr_show(

        WARN_ON(1);
        err = -ENOSYS;
  out:
        WARN_ON(1);
        err = -ENOSYS;
  out:


@@ -30,7 +30,7 @@ does not lock access between files.
        return err ? err : count;
  }
  
        return err ? err : count;
  }
  

-@@ -352,6 +358,8 @@
+@@ -352,6 +358,8 @@ static ssize_t gpiommc_config_attr_store

        int err = -EINVAL;
        unsigned long data;
  
        int err = -EINVAL;
        unsigned long data;
  


@@ -39,7 +39,7 @@ does not lock access between files.
        if (attr == &gpiommc_attr_register) {
                err = strict_strtoul(page, 10, &data);
                if (err)
        if (attr == &gpiommc_attr_register) {
                err = strict_strtoul(page, 10, &data);
                if (err)

-@@ -477,6 +485,8 @@
+@@ -477,6 +485,8 @@ static ssize_t gpiommc_config_attr_store

        WARN_ON(1);
        err = -ENOSYS;
  out:
        WARN_ON(1);
        err = -ENOSYS;
  out:


@@ -48,7 +48,7 @@ does not lock access between files.
        return err ? err : count;
  }
  
        return err ? err : count;
  }
  

-@@ -513,6 +523,7 @@
+@@ -513,6 +523,7 @@ static struct config_item *gpiommc_make_

        if (!dev)
                return NULL;
  
        if (!dev)
                return NULL;
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/930-ppc_big_endian_io_memory_accessors.patch b/target/linux/generic-2.6/patches-2.6.26/930-ppc_big_endian_io_memory_accessors.patch
index 5b3755e8716b63124736655c39df857878ebf013..25abf821df82702c6fc3211e4fb7376e7b5a279d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/930-ppc_big_endian_io_memory_accessors.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/930-ppc_big_endian_io_memory_accessors.patch
@@ -32,7 +32,7 @@ and didn't make it with the ppc32 equivalent. Thanks.
 ---
 --- a/include/asm-ppc/io.h
 +++ b/include/asm-ppc/io.h
 ---
 --- a/include/asm-ppc/io.h
 +++ b/include/asm-ppc/io.h

-@@ -413,11 +413,21 @@
+@@ -413,11 +413,21 @@ static inline unsigned int ioread16(void

        return readw(addr);
  }
  
        return readw(addr);
  }
  


@@ -54,7 +54,7 @@ and didn't make it with the ppc32 equivalent. Thanks.
  static inline void iowrite8(u8 val, void __iomem *addr)
  {
        writeb(val, addr);
  static inline void iowrite8(u8 val, void __iomem *addr)
  {
        writeb(val, addr);

-@@ -428,11 +438,21 @@
+@@ -428,11 +438,21 @@ static inline void iowrite16(u16 val, vo

        writew(val, addr);
  }
  
        writew(val, addr);
  }
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.26/940-arm_mach_types.patch
index 9e3da3cdc081f094c1b2ba5b8573dffdf8dd8e5d..9f0cdcf218c8c0751e4f7222a74555d4eb269a23 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/940-arm_mach_types.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/940-arm_mach_types.patch
@@ -9,7 +9,7 @@
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #

-@@ -1384,6 +1384,7 @@
+@@ -1384,6 +1384,7 @@ olip8                    MACH_OLIP8              OLIP8                   1378

  ghi270hg              MACH_GHI270HG           GHI270HG                1379
  davinci_dm6467_evm    MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM      1380
  davinci_dm355_evm     MACH_DAVINCI_DM350_EVM  DAVINCI_DM350_EVM       1381
  ghi270hg              MACH_GHI270HG           GHI270HG                1379
  davinci_dm6467_evm    MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM      1380
  davinci_dm355_evm     MACH_DAVINCI_DM350_EVM  DAVINCI_DM350_EVM       1381


@@ -17,7 +17,7 @@
  blackriver            MACH_BLACKRIVER         BLACKRIVER              1383
  sandgate_wp           MACH_SANDGATEWP         SANDGATEWP              1384
  cdotbwsg              MACH_CDOTBWSG           CDOTBWSG                1385
  blackriver            MACH_BLACKRIVER         BLACKRIVER              1383
  sandgate_wp           MACH_SANDGATEWP         SANDGATEWP              1384
  cdotbwsg              MACH_CDOTBWSG           CDOTBWSG                1385

-@@ -1463,7 +1464,7 @@
+@@ -1463,7 +1464,7 @@ artemis                  MACH_ARTEMIS            ARTEMIS                 1462

  htctitan              MACH_HTCTITAN           HTCTITAN                1463
  qranium                       MACH_QRANIUM            QRANIUM                 1464
  adx_wsc2              MACH_ADX_WSC2           ADX_WSC2                1465
  htctitan              MACH_HTCTITAN           HTCTITAN                1463
  qranium                       MACH_QRANIUM            QRANIUM                 1464
  adx_wsc2              MACH_ADX_WSC2           ADX_WSC2                1465


@@ -26,7 +26,7 @@
  bboard                        MACH_BBOARD             BBOARD                  1467
  cambria                       MACH_CAMBRIA            CAMBRIA                 1468
  mt7xxx                        MACH_MT7XXX             MT7XXX                  1469
  bboard                        MACH_BBOARD             BBOARD                  1467
  cambria                       MACH_CAMBRIA            CAMBRIA                 1468
  mt7xxx                        MACH_MT7XXX             MT7XXX                  1469

-@@ -1647,7 +1648,7 @@
+@@ -1647,7 +1648,7 @@ badger                   MACH_BADGER             BADGER                  1648

  trizeps4wl            MACH_TRIZEPS4WL         TRIZEPS4WL              1649
  trizeps5              MACH_TRIZEPS5           TRIZEPS5                1650
  marlin                        MACH_MARLIN             MARLIN                  1651
  trizeps4wl            MACH_TRIZEPS4WL         TRIZEPS4WL              1649
  trizeps5              MACH_TRIZEPS5           TRIZEPS5                1650
  marlin                        MACH_MARLIN             MARLIN                  1651


@@ -35,7 +35,7 @@
  hpipaq214             MACH_HPIPAQ214          HPIPAQ214               1653
  at572d940dcm          MACH_AT572D940DCM       AT572D940DCM            1654
  ne1board              MACH_NE1BOARD           NE1BOARD                1655
  hpipaq214             MACH_HPIPAQ214          HPIPAQ214               1653
  at572d940dcm          MACH_AT572D940DCM       AT572D940DCM            1654
  ne1board              MACH_NE1BOARD           NE1BOARD                1655

-@@ -1720,3 +1721,84 @@
+@@ -1720,3 +1721,84 @@ htc_kaiser              MACH_HTC_KAISER         HTC_KAISER      

  lg_ks20                       MACH_LG_KS20            LG_KS20                 1725
  hhgps                 MACH_HHGPS              HHGPS                   1726
  nokia_n810_wimax      MACH_NOKIA_N810_WIMAX   NOKIA_N810_WIMAX        1727
  lg_ks20                       MACH_LG_KS20            LG_KS20                 1725
  hhgps                 MACH_HHGPS              HHGPS                   1726
  nokia_n810_wimax      MACH_NOKIA_N810_WIMAX   NOKIA_N810_WIMAX        1727

diff --git a/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch b/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
index a4d9381b59e7e0df7558325b088ebff3eab2acdb..462147b6db15f82c7cda3147d68d03951b8dd8e8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/netfilter/xt_sctp.h
 +++ b/include/linux/netfilter/xt_sctp.h
 --- a/include/linux/netfilter/xt_sctp.h
 +++ b/include/linux/netfilter/xt_sctp.h

-@@ -37,54 +37,68 @@
+@@ -37,54 +37,68 @@ struct xt_sctp_info {

  
  #define SCTP_CHUNKMAP_SET(chunkmap, type)             \
        do {                                            \
  
  #define SCTP_CHUNKMAP_SET(chunkmap, type)             \
        do {                                            \

diff --git a/target/linux/generic-2.6/patches-2.6.26/951-revert_gcc4_4_fixes.patch b/target/linux/generic-2.6/patches-2.6.26/951-revert_gcc4_4_fixes.patch
index bc6f5d0aaf7c0b47e270ddf70b1faac32b68a220..20bd9a42ce78ef264fda808af801a5dee8fa5de6 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/951-revert_gcc4_4_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/951-revert_gcc4_4_fixes.patch
@@ -236,7 +236,7 @@
 -#endif
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
 -#endif
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile

-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.

        $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
  
  src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
        $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
  
  src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c


@@ -247,7 +247,7 @@
                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
 --- a/arch/powerpc/kernel/prom_init_check.sh
 +++ b/arch/powerpc/kernel/prom_init_check.sh
                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
 --- a/arch/powerpc/kernel/prom_init_check.sh
 +++ b/arch/powerpc/kernel/prom_init_check.sh

-@@ -48,20 +48,6 @@
+@@ -48,20 +48,6 @@ do

                fi
        done
  
                fi
        done
  


@@ -502,7 +502,7 @@
 -#endif
 --- a/arch/powerpc/lib/Makefile
 +++ b/arch/powerpc/lib/Makefile
 -#endif
 --- a/arch/powerpc/lib/Makefile
 +++ b/arch/powerpc/lib/Makefile

-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ endif

  ifeq ($(CONFIG_PPC_MERGE),y)
  obj-y                 := string.o alloc.o \
                           checksum_$(CONFIG_WORD_SIZE).o
  ifeq ($(CONFIG_PPC_MERGE),y)
  obj-y                 := string.o alloc.o \
                           checksum_$(CONFIG_WORD_SIZE).o


@@ -513,7 +513,7 @@
  
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
  
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile

-@@ -96,8 +96,6 @@
+@@ -96,8 +96,6 @@ endif

  else
        KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
  endif
  else
        KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
  endif

diff --git a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
index 003d28c0cad2a173aa123e55c1bf812cfd894a84..7c07cd107efd134f00dac1135245b7d141655445 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
@@ -1,6 +1,6 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig

-@@ -678,3 +678,6 @@
+@@ -678,3 +678,6 @@ config CRYPTO_PRNG

  source "drivers/crypto/Kconfig"
  
  endif # if CRYPTO
  source "drivers/crypto/Kconfig"
  
  endif # if CRYPTO


@@ -9,7 +9,7 @@
 +
 --- a/crypto/Makefile
 +++ b/crypto/Makefile
 +
 --- a/crypto/Makefile
 +++ b/crypto/Makefile

-@@ -72,6 +72,8 @@
+@@ -72,6 +72,8 @@ obj-$(CONFIG_CRYPTO_LZO) += lzo.o

  obj-$(CONFIG_CRYPTO_PRNG) += prng.o
  obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
  
  obj-$(CONFIG_CRYPTO_PRNG) += prng.o
  obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
  


@@ -44,7 +44,7 @@
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.

-@@ -667,6 +677,61 @@
+@@ -667,6 +677,61 @@ void add_disk_randomness(struct gendisk 

  }
  #endif
  
  }
  #endif
  


@@ -108,7 +108,7 @@
  /*********************************************************************
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
  /*********************************************************************
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c

-@@ -191,6 +191,7 @@
+@@ -191,6 +191,7 @@ asmlinkage long sys_dup(unsigned int fil

                ret = dupfd(file, 0, 0);
        return ret;
  }
                ret = dupfd(file, 0, 0);
        return ret;
  }


@@ -167,7 +167,7 @@
  struct rand_pool_info {
        int     entropy_count;
        int     buf_size;
  struct rand_pool_info {
        int     entropy_count;
        int     buf_size;

-@@ -48,6 +73,10 @@
+@@ -48,6 +73,10 @@ extern void add_input_randomness(unsigne

                                 unsigned int value);
  extern void add_interrupt_randomness(int irq);
  
                                 unsigned int value);
  extern void add_interrupt_randomness(int irq);
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/980-backport_gpio_sysfs_support.patch b/target/linux/generic-2.6/patches-2.6.26/980-backport_gpio_sysfs_support.patch
index b62724ab0470451799614ccd01d8afb3c7d538d0..efacb2512bfa3dd5eef69d37920acd6437cedcd9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/980-backport_gpio_sysfs_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/980-backport_gpio_sysfs_support.patch
@@ -70,7 +70,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 
 --- a/Documentation/gpio.txt
 +++ b/Documentation/gpio.txt
 
 --- a/Documentation/gpio.txt
 +++ b/Documentation/gpio.txt

-@@ -347,15 +347,12 @@
+@@ -347,15 +347,12 @@ necessarily be nonportable.

  Dynamic definition of GPIOs is not currently standard; for example, as
  a side effect of configuring an add-on board with some GPIO expanders.
  
  Dynamic definition of GPIOs is not currently standard; for example, as
  a side effect of configuring an add-on board with some GPIO expanders.
  


@@ -87,7 +87,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  
  As a debugging aid, if debugfs is available a /sys/kernel/debug/gpio file
  will be found there.  That will list all the controllers registered through
  
  As a debugging aid, if debugfs is available a /sys/kernel/debug/gpio file
  will be found there.  That will list all the controllers registered through

-@@ -439,4 +436,120 @@
+@@ -439,4 +436,120 @@ becomes available.  That may mean the de

  calls for that GPIO can work.  One way to address such dependencies is for
  such gpio_chip controllers to provide setup() and teardown() callbacks to
  board specific code; those board specific callbacks would register devices
  calls for that GPIO can work.  One way to address such dependencies is for
  such gpio_chip controllers to provide setup() and teardown() callbacks to
  board specific code; those board specific callbacks would register devices


@@ -211,7 +211,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 +suitable for documenting as part of a board support package.
 --- a/arch/arm/plat-omap/gpio.c
 +++ b/arch/arm/plat-omap/gpio.c
 +suitable for documenting as part of a board support package.
 --- a/arch/arm/plat-omap/gpio.c
 +++ b/arch/arm/plat-omap/gpio.c

-@@ -1488,6 +1488,9 @@
+@@ -1488,6 +1488,9 @@ static int __init _omap_gpio_init(void)

                bank->chip.set = gpio_set;
                if (bank_is_mpuio(bank)) {
                        bank->chip.label = "mpuio";
                bank->chip.set = gpio_set;
                if (bank_is_mpuio(bank)) {
                        bank->chip.label = "mpuio";


@@ -223,7 +223,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
                        bank->chip.label = "gpio";
 --- a/arch/avr32/mach-at32ap/pio.c
 +++ b/arch/avr32/mach-at32ap/pio.c
                        bank->chip.label = "gpio";
 --- a/arch/avr32/mach-at32ap/pio.c
 +++ b/arch/avr32/mach-at32ap/pio.c

-@@ -358,6 +358,8 @@
+@@ -358,6 +358,8 @@ static int __init pio_probe(struct platf

        pio->chip.label = pio->name;
        pio->chip.base = pdev->id * 32;
        pio->chip.ngpio = 32;
        pio->chip.label = pio->name;
        pio->chip.base = pdev->id * 32;
        pio->chip.ngpio = 32;


@@ -234,7 +234,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        pio->chip.get = gpio_get;
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
        pio->chip.get = gpio_get;
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig

-@@ -23,6 +23,21 @@
+@@ -23,6 +23,21 @@ config DEBUG_GPIO

          slower.  The diagnostics help catch the type of setup errors
          that are most common when setting up new platforms or boards.
  
          slower.  The diagnostics help catch the type of setup errors
          that are most common when setting up new platforms or boards.
  


@@ -272,7 +272,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  
  
  /* Optional implementation infrastructure for GPIO interfaces.
  
  
  /* Optional implementation infrastructure for GPIO interfaces.

-@@ -44,6 +47,8 @@
+@@ -44,6 +47,8 @@ struct gpio_desc {

  #define FLAG_REQUESTED        0
  #define FLAG_IS_OUT   1
  #define FLAG_RESERVED 2
  #define FLAG_REQUESTED        0
  #define FLAG_IS_OUT   1
  #define FLAG_RESERVED 2


@@ -281,7 +281,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  
  #ifdef CONFIG_DEBUG_FS
        const char              *label;
  
  #ifdef CONFIG_DEBUG_FS
        const char              *label;

-@@ -151,6 +156,486 @@
+@@ -151,6 +156,486 @@ err:

        return ret;
  }
  
        return ret;
  }
  


@@ -768,7 +768,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  /**
   * gpiochip_add() - register a gpio_chip
   * @chip: the chip to register, with chip->base initialized
  /**
   * gpiochip_add() - register a gpio_chip
   * @chip: the chip to register, with chip->base initialized

-@@ -160,6 +645,11 @@
+@@ -160,6 +645,11 @@ err:

   * because the chip->base is invalid or already associated with a
   * different chip.  Otherwise it returns zero as a success code.
   *
   * because the chip->base is invalid or already associated with a
   * different chip.  Otherwise it returns zero as a success code.
   *


@@ -780,7 +780,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
   * If chip->base is negative, this requests dynamic assignment of
   * a range of valid GPIOs.
   */
   * If chip->base is negative, this requests dynamic assignment of
   * a range of valid GPIOs.
   */

-@@ -182,7 +672,7 @@
+@@ -182,7 +672,7 @@ int gpiochip_add(struct gpio_chip *chip)

                base = gpiochip_find_base(chip->ngpio);
                if (base < 0) {
                        status = base;
                base = gpiochip_find_base(chip->ngpio);
                if (base < 0) {
                        status = base;


@@ -789,7 +789,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
                }
                chip->base = base;
        }
                }
                chip->base = base;
        }

-@@ -197,12 +687,23 @@
+@@ -197,12 +687,23 @@ int gpiochip_add(struct gpio_chip *chip)

        if (status == 0) {
                for (id = base; id < base + chip->ngpio; id++) {
                        gpio_desc[id].chip = chip;
        if (status == 0) {
                for (id = base; id < base + chip->ngpio; id++) {
                        gpio_desc[id].chip = chip;


@@ -815,7 +815,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  fail:
        /* failures here can mean systems won't boot... */
        if (status)
  fail:
        /* failures here can mean systems won't boot... */
        if (status)

-@@ -239,6 +740,10 @@
+@@ -239,6 +740,10 @@ int gpiochip_remove(struct gpio_chip *ch

        }
  
        spin_unlock_irqrestore(&gpio_lock, flags);
        }
  
        spin_unlock_irqrestore(&gpio_lock, flags);


@@ -826,7 +826,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        return status;
  }
  EXPORT_SYMBOL_GPL(gpiochip_remove);
        return status;
  }
  EXPORT_SYMBOL_GPL(gpiochip_remove);

-@@ -296,6 +801,8 @@
+@@ -296,6 +801,8 @@ void gpio_free(unsigned gpio)

                return;
        }
  
                return;
        }
  


@@ -835,7 +835,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        spin_lock_irqsave(&gpio_lock, flags);
  
        desc = &gpio_desc[gpio];
        spin_lock_irqsave(&gpio_lock, flags);
  
        desc = &gpio_desc[gpio];

-@@ -534,10 +1041,6 @@
+@@ -534,10 +1041,6 @@ EXPORT_SYMBOL_GPL(gpio_set_value_canslee

  
  #ifdef CONFIG_DEBUG_FS
  
  
  #ifdef CONFIG_DEBUG_FS
  


@@ -846,7 +846,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip)
  {
        unsigned                i;
  static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip)
  {
        unsigned                i;

-@@ -614,17 +1117,28 @@
+@@ -614,17 +1117,28 @@ static int gpiolib_show(struct seq_file 

        /* REVISIT this isn't locked against gpio_chip removal ... */
  
        for (gpio = 0; gpio_is_valid(gpio); gpio++) {
        /* REVISIT this isn't locked against gpio_chip removal ... */
  
        for (gpio = 0; gpio_is_valid(gpio); gpio++) {


@@ -881,7 +881,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
                        chip->dbg_show(s, chip);
 --- a/drivers/gpio/mcp23s08.c
 +++ b/drivers/gpio/mcp23s08.c
                        chip->dbg_show(s, chip);
 --- a/drivers/gpio/mcp23s08.c
 +++ b/drivers/gpio/mcp23s08.c

-@@ -239,6 +239,7 @@
+@@ -239,6 +239,7 @@ static int mcp23s08_probe(struct spi_dev

        mcp->chip.base = pdata->base;
        mcp->chip.ngpio = 8;
        mcp->chip.can_sleep = 1;
        mcp->chip.base = pdata->base;
        mcp->chip.ngpio = 8;
        mcp->chip.can_sleep = 1;


@@ -891,7 +891,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        spi_set_drvdata(spi, mcp);
 --- a/drivers/gpio/pca953x.c
 +++ b/drivers/gpio/pca953x.c
        spi_set_drvdata(spi, mcp);
 --- a/drivers/gpio/pca953x.c
 +++ b/drivers/gpio/pca953x.c

-@@ -188,6 +188,7 @@
+@@ -188,6 +188,7 @@ static void pca953x_setup_gpio(struct pc

        gc->base = chip->gpio_start;
        gc->ngpio = gpios;
        gc->label = chip->client->name;
        gc->base = chip->gpio_start;
        gc->ngpio = gpios;
        gc->label = chip->client->name;


@@ -901,7 +901,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  
 --- a/drivers/gpio/pcf857x.c
 +++ b/drivers/gpio/pcf857x.c
  
 --- a/drivers/gpio/pcf857x.c
 +++ b/drivers/gpio/pcf857x.c

-@@ -175,6 +175,7 @@
+@@ -175,6 +175,7 @@ static int pcf857x_probe(struct i2c_clie

  
        gpio->chip.base = pdata->gpio_base;
        gpio->chip.can_sleep = 1;
  
        gpio->chip.base = pdata->gpio_base;
        gpio->chip.can_sleep = 1;


@@ -911,7 +911,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        /* NOTE:  the OnSemi jlc1562b is also largely compatible with
 --- a/drivers/i2c/chips/tps65010.c
 +++ b/drivers/i2c/chips/tps65010.c
        /* NOTE:  the OnSemi jlc1562b is also largely compatible with
 --- a/drivers/i2c/chips/tps65010.c
 +++ b/drivers/i2c/chips/tps65010.c

-@@ -636,6 +636,8 @@
+@@ -636,6 +636,8 @@ static int tps65010_probe(struct i2c_cli

                tps->outmask = board->outmask;
  
                tps->chip.label = client->name;
                tps->outmask = board->outmask;
  
                tps->chip.label = client->name;


@@ -922,7 +922,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
                tps->chip.direction_output = tps65010_output;
 --- a/drivers/mfd/htc-egpio.c
 +++ b/drivers/mfd/htc-egpio.c
                tps->chip.direction_output = tps65010_output;
 --- a/drivers/mfd/htc-egpio.c
 +++ b/drivers/mfd/htc-egpio.c

-@@ -318,6 +318,8 @@
+@@ -318,6 +318,8 @@ static int __init egpio_probe(struct pla

                ei->chip[i].dev = &(pdev->dev);
                chip = &(ei->chip[i].chip);
                chip->label           = "htc-egpio";
                ei->chip[i].dev = &(pdev->dev);
                chip = &(ei->chip[i].chip);
                chip->label           = "htc-egpio";


@@ -933,7 +933,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
                chip->direction_input = egpio_direction_input;
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
                chip->direction_input = egpio_direction_input;
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h

-@@ -32,6 +32,8 @@
+@@ -32,6 +32,8 @@ struct module;

  /**
   * struct gpio_chip - abstract a GPIO controller
   * @label: for diagnostics
  /**
   * struct gpio_chip - abstract a GPIO controller
   * @label: for diagnostics


@@ -942,7 +942,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
   * @direction_input: configures signal "offset" as input, or returns error
   * @get: returns value for signal "offset"; for output signals this
   *    returns either the value actually sensed, or zero
   * @direction_input: configures signal "offset" as input, or returns error
   * @get: returns value for signal "offset"; for output signals this
   *    returns either the value actually sensed, or zero

-@@ -59,6 +61,7 @@
+@@ -59,6 +61,7 @@ struct module;

   */
  struct gpio_chip {
        char                    *label;
   */
  struct gpio_chip {
        char                    *label;


@@ -950,7 +950,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
        struct module           *owner;
  
        int                     (*direction_input)(struct gpio_chip *chip,
        struct module           *owner;
  
        int                     (*direction_input)(struct gpio_chip *chip,

-@@ -74,6 +77,7 @@
+@@ -74,6 +77,7 @@ struct gpio_chip {

        int                     base;
        u16                     ngpio;
        unsigned                can_sleep:1;
        int                     base;
        u16                     ngpio;
        unsigned                can_sleep:1;


@@ -958,7 +958,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  };
  
  extern const char *gpiochip_is_requested(struct gpio_chip *chip,
  };
  
  extern const char *gpiochip_is_requested(struct gpio_chip *chip,

-@@ -108,7 +112,18 @@
+@@ -108,7 +112,18 @@ extern void __gpio_set_value(unsigned gp

  extern int __gpio_cansleep(unsigned gpio);
  
  
  extern int __gpio_cansleep(unsigned gpio);
  
  


@@ -978,7 +978,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  
  static inline int gpio_is_valid(int number)
  {
  
  static inline int gpio_is_valid(int number)
  {

-@@ -137,6 +152,22 @@
+@@ -137,6 +152,22 @@ static inline void gpio_set_value_cansle

        gpio_set_value(gpio, value);
  }
  
        gpio_set_value(gpio, value);
  }
  


@@ -1004,7 +1004,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  #endif /* _ASM_GENERIC_GPIO_H */
 --- a/include/linux/gpio.h
 +++ b/include/linux/gpio.h
  #endif /* _ASM_GENERIC_GPIO_H */
 --- a/include/linux/gpio.h
 +++ b/include/linux/gpio.h

-@@ -79,6 +79,19 @@
+@@ -79,6 +79,19 @@ static inline void gpio_set_value_cansle

        WARN_ON(1);
  }
  
        WARN_ON(1);
  }
  

diff --git a/target/linux/generic-2.6/patches-2.6.26/981-backport_usb_serial_sierrawireless_ids.patch b/target/linux/generic-2.6/patches-2.6.26/981-backport_usb_serial_sierrawireless_ids.patch
index 161d2d00276626c509bec572691d7e212cd65245..2cb85a041f254fdd3db88c38efb7ce4e2eaa0045 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/981-backport_usb_serial_sierrawireless_ids.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/981-backport_usb_serial_sierrawireless_ids.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/serial/sierra.c
 +++ b/drivers/usb/serial/sierra.c
 --- a/drivers/usb/serial/sierra.c
 +++ b/drivers/usb/serial/sierra.c

-@@ -205,6 +205,7 @@
+@@ -205,6 +205,7 @@ static struct usb_device_id id_table [] 

        { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/
        { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/
        { USB_DEVICE(0x1199, 0x683B), .driver_info = DEVICE_1_PORT },   /* Sierra Wireless MC8785 Composite*/
        { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/
        { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/
        { USB_DEVICE(0x1199, 0x683B), .driver_info = DEVICE_1_PORT },   /* Sierra Wireless MC8785 Composite*/

diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch
index db43c90b2ced642dde7fe8daebe2306bc532d163..e33a470fde4aeaec85fa5a5d1d642310f09bc6f3 100644 (file)
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig

-@@ -78,6 +78,21 @@
+@@ -78,6 +78,21 @@ config MIPS_COBALT

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
  
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
  


@@ -22,7 +22,7 @@
  config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
  config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32

-@@ -697,6 +712,7 @@
+@@ -697,6 +712,7 @@ source "arch/mips/sibyte/Kconfig"

  source "arch/mips/tx4927/Kconfig"
  source "arch/mips/tx4938/Kconfig"
  source "arch/mips/vr41xx/Kconfig"
  source "arch/mips/tx4927/Kconfig"
  source "arch/mips/tx4938/Kconfig"
  source "arch/mips/vr41xx/Kconfig"


@@ -32,7 +32,7 @@
  
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
  
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile

-@@ -283,6 +283,13 @@
+@@ -283,6 +283,13 @@ cflags-$(CONFIG_MIPS_COBALT)      += -Iinclud

  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  
  #
  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  
  #


@@ -63,7 +63,7 @@
  extern char *system_type;
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c
  extern char *system_type;
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c

-@@ -1464,6 +1464,7 @@
+@@ -1464,6 +1464,7 @@ void __cpuinit per_cpu_trap_init(void)

         */
        if (cpu_has_mips_r2) {
                cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
         */
        if (cpu_has_mips_r2) {
                cp0_compare_irq = (read_c0_intctl() >> 29) & 7;


@@ -73,7 +73,7 @@
                        cp0_perfcount_irq = -1;
 --- a/arch/mips/pci/Makefile
 +++ b/arch/mips/pci/Makefile
                        cp0_perfcount_irq = -1;
 --- a/arch/mips/pci/Makefile
 +++ b/arch/mips/pci/Makefile

-@@ -48,3 +48,4 @@
+@@ -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_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o

diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch
index a25c57003abed7bf106a85fdb794f41418fbce10..931978fd9a76c9ac72b95ab3af5ae3192e710116 100644 (file)
--- a/target/linux/ifxmips/patches/110-drivers.patch
+++ b/target/linux/ifxmips/patches/110-drivers.patch
@@ -1,6 +1,6 @@
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile

-@@ -114,6 +114,10 @@
+@@ -114,6 +114,10 @@ obj-$(CONFIG_PS3_FLASH)           += ps3flash.o

  obj-$(CONFIG_JS_RTC)          += js-rtc.o
  js-rtc-y = rtc.o
  
  obj-$(CONFIG_JS_RTC)          += js-rtc.o
  js-rtc-y = rtc.o
  


@@ -13,14 +13,14 @@
  
 --- a/drivers/mtd/maps/Makefile
 +++ b/drivers/mtd/maps/Makefile
  
 --- a/drivers/mtd/maps/Makefile
 +++ b/drivers/mtd/maps/Makefile

-@@ -67,3 +67,4 @@
+@@ -67,3 +67,4 @@ obj-$(CONFIG_MTD_PLATRAM)    += plat-ram.o

  obj-$(CONFIG_MTD_OMAP_NOR)    += omap_nor.o
  obj-$(CONFIG_MTD_MTX1)                += mtx-1_flash.o
  obj-$(CONFIG_MTD_INTEL_VR_NOR)        += intel_vr_nor.o
 +obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
  obj-$(CONFIG_MTD_OMAP_NOR)    += omap_nor.o
  obj-$(CONFIG_MTD_MTX1)                += mtx-1_flash.o
  obj-$(CONFIG_MTD_INTEL_VR_NOR)        += intel_vr_nor.o
 +obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -351,6 +351,12 @@
+@@ -351,6 +351,12 @@ config MACB

  
  source "drivers/net/arm/Kconfig"
  
  
  source "drivers/net/arm/Kconfig"
  


@@ -35,7 +35,7 @@
        depends on ARM || MIPS || SUPERH
 --- a/drivers/serial/Kconfig
 +++ b/drivers/serial/Kconfig
        depends on ARM || MIPS || SUPERH
 --- a/drivers/serial/Kconfig
 +++ b/drivers/serial/Kconfig

-@@ -1334,6 +1334,14 @@
+@@ -1334,6 +1334,14 @@ config SERIAL_OF_PLATFORM

          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
  
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
  


@@ -52,14 +52,14 @@
        depends on QUICC_ENGINE
 --- a/drivers/serial/Makefile
 +++ b/drivers/serial/Makefile
        depends on QUICC_ENGINE
 --- a/drivers/serial/Makefile
 +++ b/drivers/serial/Makefile

-@@ -68,3 +68,4 @@
+@@ -68,3 +68,4 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_s

  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
 --- 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
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
  obj-$(CONFIG_TXX9_WDT) += txx9wdt.o


@@ -69,7 +69,7 @@
  
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
  
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -256,4 +256,4 @@
+@@ -256,4 +256,4 @@ obj-$(CONFIG_NETXEN_NIC) += netxen/

  obj-$(CONFIG_NIU) += niu.o
  obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
  obj-$(CONFIG_SFC) += sfc/
  obj-$(CONFIG_NIU) += niu.o
  obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
  obj-$(CONFIG_SFC) += sfc/


@@ -77,7 +77,7 @@
 +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
 +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig

-@@ -9,6 +9,9 @@
+@@ -9,6 +9,9 @@ menuconfig CRYPTO_HW

          If you say N, all options in this submenu will be skipped and disabled.
  
  if CRYPTO_HW
          If you say N, all options in this submenu will be skipped and disabled.
  
  if CRYPTO_HW


@@ -89,14 +89,14 @@
        tristate "Support for VIA PadLock ACE"
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile
        tristate "Support for VIA PadLock ACE"
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile

-@@ -4,3 +4,4 @@
+@@ -4,3 +4,4 @@ obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-

  obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
  obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
  obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
 +obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig
  obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
  obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
  obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
 +obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig

-@@ -305,3 +305,10 @@
+@@ -305,3 +305,10 @@ config SUPERH_ON_CHIP_R8A66597

        help
           This driver enables support for the on-chip R8A66597 in the
           SH7366 and SH7723 processors.
        help
           This driver enables support for the on-chip R8A66597 in the
           SH7366 and SH7723 processors.


@@ -109,7 +109,7 @@
 +       Danube USB Host Controller
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 +       Danube USB Host Controller
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig

-@@ -153,6 +153,12 @@
+@@ -153,6 +153,12 @@ config LEDS_CLEVO_MAIL

          To compile this driver as a module, choose M here: the
          module will be called leds-clevo-mail.
  
          To compile this driver as a module, choose M here: the
          module will be called leds-clevo-mail.
  


@@ -124,7 +124,7 @@
  config LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
  config LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile

-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_CM_X270)              

  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
  obj-$(CONFIG_LEDS_FSG)                        += leds-fsg.o
  obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
  obj-$(CONFIG_LEDS_FSG)                        += leds-fsg.o


@@ -134,7 +134,7 @@
  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
  obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig

-@@ -683,6 +683,12 @@
+@@ -683,6 +683,12 @@ config TXX9_WDT

        help
          Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
  
        help
          Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
  

diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch
index 7649ec1ff4d7d3c522cee17003db1ce020fe08ef..5c98c355259a48b5cfbc6e52386f097061b1452c 100644 (file)
--- a/target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/target/linux/ifxmips/patches/160-cfi-swap.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c

-@@ -1041,7 +1041,9 @@
+@@ -1041,7 +1041,9 @@ static int __xipram do_write_oneword(str

        int retry_cnt = 0;
  
        adr += chip->start;
        int retry_cnt = 0;
  
        adr += chip->start;

diff --git a/target/linux/ifxmips/patches/170-dma_hack.patch b/target/linux/ifxmips/patches/170-dma_hack.patch
index 38c58bb5cc2ac02f006b8510469b2382ea021a80..6175c3e8f644ab65f494e9d1f74d23916d172b1f 100644 (file)
--- a/target/linux/ifxmips/patches/170-dma_hack.patch
+++ b/target/linux/ifxmips/patches/170-dma_hack.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/mm/cache.c
 +++ b/arch/mips/mm/cache.c
 --- a/arch/mips/mm/cache.c
 +++ b/arch/mips/mm/cache.c

-@@ -50,6 +50,8 @@
+@@ -50,6 +50,8 @@ void (*_dma_cache_wback)(unsigned long s

  void (*_dma_cache_inv)(unsigned long start, unsigned long size);
  
  EXPORT_SYMBOL(_dma_cache_wback_inv);
  void (*_dma_cache_inv)(unsigned long start, unsigned long size);
  
  EXPORT_SYMBOL(_dma_cache_wback_inv);

diff --git a/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
index 048b9f7465a9a234662642805bad54f67ed39b7b..f5038021d62a7b7d23a7d35d6bec0ae13356552d 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig

-@@ -165,6 +165,7 @@
+@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y

  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y
  CONFIG_ARCH_IXDP4XX=y
  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y
  CONFIG_ARCH_IXDP4XX=y


@@ -8,7 +8,7 @@
  CONFIG_CPU_IXP46X=y
  CONFIG_CPU_IXP43X=y
  CONFIG_MACH_GTWX5715=y
  CONFIG_CPU_IXP46X=y
  CONFIG_CPU_IXP43X=y
  CONFIG_MACH_GTWX5715=y

-@@ -770,7 +771,7 @@
+@@ -770,7 +771,7 @@ CONFIG_ATA=y

  # CONFIG_SATA_SIL24 is not set
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set
  # CONFIG_SATA_SIL24 is not set
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set


@@ -17,7 +17,7 @@
  # CONFIG_SATA_VITESSE is not set
  # CONFIG_SATA_INIC162X is not set
  # CONFIG_PATA_ALI is not set
  # CONFIG_SATA_VITESSE is not set
  # CONFIG_SATA_INIC162X is not set
  # CONFIG_PATA_ALI is not set

-@@ -1143,7 +1144,7 @@
+@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y

  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set
  # CONFIG_SENSORS_VT8231 is not set
  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set
  # CONFIG_SENSORS_VT8231 is not set


@@ -26,7 +26,7 @@
  # CONFIG_SENSORS_W83791D is not set
  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set
  # CONFIG_SENSORS_W83791D is not set
  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set

-@@ -1334,8 +1335,8 @@
+@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y

  #
  # LED drivers
  #
  #
  # LED drivers
  #


@@ -36,7 +36,7 @@
  
  #
  # LED Triggers
  
  #
  # LED Triggers

-@@ -1367,7 +1368,7 @@
+@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y

  # CONFIG_RTC_DRV_DS1672 is not set
  # CONFIG_RTC_DRV_MAX6900 is not set
  # CONFIG_RTC_DRV_RS5C372 is not set
  # CONFIG_RTC_DRV_DS1672 is not set
  # CONFIG_RTC_DRV_MAX6900 is not set
  # CONFIG_RTC_DRV_RS5C372 is not set


@@ -47,7 +47,7 @@
  # CONFIG_RTC_DRV_PCF8583 is not set
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
  # CONFIG_RTC_DRV_PCF8583 is not set
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -125,6 +125,15 @@
+@@ -125,6 +125,15 @@ config    ARCH_IXDP4XX

        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
        default y
  
        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
        default y
  


@@ -65,7 +65,7 @@
  #
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
  #
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D)               += nas10

  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o


@@ -73,7 +73,7 @@
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D)   += nas100d-se

  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o

diff --git a/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch
index bbdd00c80f3cc21ab53bddcd620bc22be0b530c2..a19a4085ae5ad499abf71e8ee2aba9171ede7315 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/100-wg302v2_gateway7001_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
 +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
 +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c

-@@ -76,9 +76,35 @@
+@@ -76,9 +76,35 @@ static struct platform_device gateway700

        .resource       = &gateway7001_uart_resource,
  };
  
        .resource       = &gateway7001_uart_resource,
  };
  


@@ -39,7 +39,7 @@
  static void __init gateway7001_init(void)
 --- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
  static void __init gateway7001_init(void)
 --- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c

-@@ -77,9 +77,26 @@
+@@ -77,9 +77,26 @@ static struct platform_device wg302v2_ua

        .resource       = &wg302v2_uart_resource,
  };
  
        .resource       = &wg302v2_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch b/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch
index 70c91db6372b60c95bda440d00d7689254082d57..1951ff9acd347371a6f29c70ed7d4b442421bd77 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/105-wg302v1_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig

-@@ -155,6 +155,7 @@
+@@ -155,6 +155,7 @@ CONFIG_MACH_AVILA=y

  CONFIG_MACH_LOFT=y
  CONFIG_ARCH_ADI_COYOTE=y
  CONFIG_MACH_GATEWAY7001=y
  CONFIG_MACH_LOFT=y
  CONFIG_ARCH_ADI_COYOTE=y
  CONFIG_MACH_GATEWAY7001=y


@@ -10,7 +10,7 @@
  CONFIG_MACH_IXDPG425=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
  CONFIG_MACH_IXDPG425=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -49,6 +49,14 @@
+@@ -49,6 +49,14 @@ config MACH_GATEWAY7001

          7001 Access Point. For more information on this platform,
          see http://openwrt.org
  
          7001 Access Point. For more information on this platform,
          see http://openwrt.org
  


@@ -27,7 +27,7 @@
        select PCI
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        select PCI
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -14,6 +14,7 @@
+@@ -14,6 +14,7 @@ obj-pci-$(CONFIG_MACH_NSLU2)         += nslu2-p

  obj-pci-$(CONFIG_MACH_NAS100D)                += nas100d-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_NAS100D)                += nas100d-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o


@@ -35,7 +35,7 @@
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  

-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NSLU2)     += nslu2-setup.

  obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o

diff --git a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
index 45589a8626f4248c8506b15f4ff401bd6e2768ea..dcfb65033f597d4654cfa64b6e647c4a7b5590b8 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/110-pronghorn_series_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig

-@@ -157,6 +157,8 @@
+@@ -157,6 +157,8 @@ CONFIG_ARCH_ADI_COYOTE=y

  CONFIG_MACH_GATEWAY7001=y
  CONFIG_MACH_WG302V1=y
  CONFIG_MACH_WG302V2=y
  CONFIG_MACH_GATEWAY7001=y
  CONFIG_MACH_WG302V1=y
  CONFIG_MACH_WG302V2=y


@@ -11,7 +11,7 @@
  CONFIG_MACH_IXDP465=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
  CONFIG_MACH_IXDP465=y
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -65,6 +65,22 @@
+@@ -65,6 +65,22 @@ config MACH_WG302V2

          WG302 v2 or WAG302 v2 Access Points. For more information
          on this platform, see http://openwrt.org
  
          WG302 v2 or WAG302 v2 Access Points. For more information
          on this platform, see http://openwrt.org
  


@@ -36,7 +36,7 @@
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -17,6 +17,7 @@
+@@ -17,6 +17,7 @@ obj-pci-$(CONFIG_MACH_GATEWAY7001)   += ga

  obj-pci-$(CONFIG_MACH_WG302V1)                += wg302v1-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_WG302V1)                += wg302v1-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o


@@ -44,7 +44,7 @@
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -32,6 +33,7 @@
+@@ -32,6 +33,7 @@ obj-$(CONFIG_MACH_GATEWAY7001)       += gatewa

  obj-$(CONFIG_MACH_WG302V1)    += wg302v1-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_WG302V1)    += wg302v1-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o


@@ -375,7 +375,7 @@
 +MACHINE_END
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
 +MACHINE_END
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h

-@@ -41,7 +41,8 @@
+@@ -41,7 +41,8 @@ static __inline__ void __arch_decomp_set

         * Some boards are using UART2 as console
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
         * Some boards are using UART2 as console
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||

diff --git a/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch b/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch
index c2b684d0560ac3a5fe9341dd0e0c2a93388afa3b..b9fa507689bf5413f85f31c8470e4f9fffe7da26 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/111-pronghorn_swap_uarts.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
 +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c
 --- a/arch/arm/mach-ixp4xx/pronghorn-setup.c
 +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c

-@@ -51,31 +51,31 @@
+@@ -51,31 +51,31 @@ static struct platform_device pronghorn_

  
  static struct resource pronghorn_uart_resources [] = {
        {
  
  static struct resource pronghorn_uart_resources [] = {
        {

diff --git a/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch
index 038d173fc2782339781aa09f8dee0e8542b4c019..9a05fabec42c92317a5182dab60c3f702bc7fb20 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/115-sidewinder_support.patch
@@ -15,7 +15,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
 
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -81,6 +81,14 @@
+@@ -81,6 +81,14 @@ config MACH_PRONGHORN

  config MACH_PRONGHORNMETRO
        def_bool MACH_PRONGHORN
  
  config MACH_PRONGHORNMETRO
        def_bool MACH_PRONGHORN
  


@@ -30,7 +30,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  config ARCH_IXDP425
        bool "IXDP425"
        help
  config ARCH_IXDP425
        bool "IXDP425"
        help

-@@ -163,7 +171,7 @@
+@@ -163,7 +171,7 @@ config MACH_FSG

  #
  config CPU_IXP46X
        bool
  #
  config CPU_IXP46X
        bool


@@ -41,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  config CPU_IXP43X
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
  config CPU_IXP43X
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ obj-pci-$(CONFIG_MACH_WG302V1)               += wg302

  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o


@@ -49,7 +49,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -34,6 +35,7 @@
+@@ -34,6 +35,7 @@ obj-$(CONFIG_MACH_WG302V1)   += wg302v1-se

  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o

diff --git a/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch b/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
index da685ef74e083d7a49a08f5598619565900298c5..19045b05dca9218a47895b1216664471a8f249ad 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
@@ -9,7 +9,7 @@
  struct fis_image_desc {
      unsigned char name[16];      // Null terminated name
      uint32_t    flash_base;    // Address within FLASH of image
  struct fis_image_desc {
      unsigned char name[16];      // Null terminated name
      uint32_t    flash_base;    // Address within FLASH of image

-@@ -32,7 +34,8 @@
+@@ -32,7 +34,8 @@ struct fis_list {

        struct fis_list *next;
  };
  
        struct fis_list *next;
  };
  


@@ -19,7 +19,7 @@
  module_param(directory, int, 0);
  
  static inline int redboot_checksum(struct fis_image_desc *img)
  module_param(directory, int, 0);
  
  static inline int redboot_checksum(struct fis_image_desc *img)

-@@ -61,6 +64,8 @@
+@@ -61,6 +64,8 @@ static int parse_redboot_partitions(stru

  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        static char nullstring[] = "unallocated";
  #endif
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        static char nullstring[] = "unallocated";
  #endif

diff --git a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
index f53ad82334418a7c4d2a6d8764bfdb780f7bc846..c4abf7fdada772bef11bfd1dfc901a689c90a4b9 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/120-compex_support.patch
@@ -15,7 +15,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
 
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -89,6 +89,14 @@
+@@ -89,6 +89,14 @@ config MACH_SIDEWINDER

          Engineering Sidewinder board. For more information on this
          platform, see http://www.adiengineering.com
  
          Engineering Sidewinder board. For more information on this
          platform, see http://www.adiengineering.com
  


@@ -32,7 +32,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -19,6 +19,7 @@
+@@ -19,6 +19,7 @@ obj-pci-$(CONFIG_MACH_WG302V2)               += wg302

  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_FSG)            += fsg-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o


@@ -40,7 +40,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -36,6 +37,7 @@
+@@ -36,6 +37,7 @@ obj-$(CONFIG_MACH_WG302V2)   += wg302v2-se

  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_FSG)                += fsg-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o


@@ -189,7 +189,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 +MACHINE_END
 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +MACHINE_END
 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c

-@@ -66,7 +66,8 @@
+@@ -66,7 +66,8 @@ struct hw_pci ixdp425_pci __initdata = {

  int __init ixdp425_pci_init(void)
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
  int __init ixdp425_pci_init(void)
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||


@@ -201,7 +201,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  }
 --- a/arch/arm/tools/mach-types
 +++ b/arch/arm/tools/mach-types
  }
 --- a/arch/arm/tools/mach-types
 +++ b/arch/arm/tools/mach-types

-@@ -1276,7 +1276,7 @@
+@@ -1276,7 +1276,7 @@ oiab                     MACH_OIAB               OIAB                    1269

  smdk6400              MACH_SMDK6400           SMDK6400                1270
  nokia_n800            MACH_NOKIA_N800         NOKIA_N800              1271
  greenphone            MACH_GREENPHONE         GREENPHONE              1272
  smdk6400              MACH_SMDK6400           SMDK6400                1270
  nokia_n800            MACH_NOKIA_N800         NOKIA_N800              1271
  greenphone            MACH_GREENPHONE         GREENPHONE              1272

diff --git a/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch
index 713986dc59aeaba127d74cd85cf4afbd8922e0b1..7917240a655a85c5088ec0cb955089e0376713b6 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/130-wrt300nv2_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -97,6 +97,14 @@
+@@ -97,6 +97,14 @@ config MACH_COMPEX

          WP18 or NP18A boards. For more information on this
          platform, see http://www.compex.com.sg/home/OEM/product_ap.htm
  
          WP18 or NP18A boards. For more information on this
          platform, see http://www.compex.com.sg/home/OEM/product_ap.htm
  


@@ -17,7 +17,7 @@
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -20,6 +20,7 @@
+@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_FSG)           += fsg-pci.o

  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o


@@ -25,7 +25,7 @@
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -38,6 +39,7 @@
+@@ -38,6 +39,7 @@ obj-$(CONFIG_MACH_FSG)               += fsg-setup.o

  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o


@@ -214,7 +214,7 @@
 +#endif
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
 +#endif
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h

-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ static __inline__ void __arch_decomp_set

         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||

diff --git a/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch
index f199fc9b954735e6be77850b7e711e302f4b1869..3ab68c4f3a1b29c43ee59b6b00fe1ddba2c636be 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/131-wrt300nv2_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 --- a/arch/arm/mach-ixp4xx/wrt300nv2-setup.c
 +++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c

-@@ -76,9 +76,36 @@
+@@ -76,9 +76,36 @@ static struct platform_device wrt300nv2_

        .resource       = &wrt300nv2_uart_resource,
  };
  
        .resource       = &wrt300nv2_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
index 16f6f012eb6b9e29a068bb27abb831dc26c0e897..0721658a3aec072a7396f190304b2cf3dd8c02ff 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/150-lanready_ap1000_support.patch
@@ -154,7 +154,7 @@
 +#endif
 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +#endif
 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c

-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ int __init ixdp425_pci_init(void)

  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
                        machine_is_ixdp465() || machine_is_kixrp435() ||
  {
        if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
                        machine_is_ixdp465() || machine_is_kixrp435() ||


@@ -165,7 +165,7 @@
  }
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
  }
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -105,6 +105,14 @@
+@@ -105,6 +105,14 @@ config MACH_WRT300NV2

          WRT300N v2 router. For more information on this
          platform, see http://openwrt.org
  
          WRT300N v2 router. For more information on this
          platform, see http://openwrt.org
  


@@ -182,7 +182,7 @@
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ obj-pci-$(CONFIG_MACH_PRONGHORN)     += pron

  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o


@@ -190,7 +190,7 @@
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -40,6 +41,7 @@
+@@ -40,6 +41,7 @@ obj-$(CONFIG_MACH_PRONGHORN) += pronghor

  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o

diff --git a/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch
index f5c5391ccc4365e1542e4b232428ae8c471d52c3..a1214d5676adbbfd3f64f0e837d6674b89154c77 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/151-lanready_ap1000_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/ap1000-setup.c
 +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c
 --- a/arch/arm/mach-ixp4xx/ap1000-setup.c
 +++ b/arch/arm/mach-ixp4xx/ap1000-setup.c

-@@ -90,9 +90,37 @@
+@@ -90,9 +90,37 @@ static struct platform_device ap1000_uar

        .resource               = ap1000_uart_resources
  };
  
        .resource               = ap1000_uart_resources
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
index f2d8fde550a88836a2d39a75d6c616889b98f064..684db44751338ed1aad740f737a777c0848cafc4 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
 --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c

-@@ -115,6 +115,36 @@
+@@ -115,6 +115,36 @@ static struct platform_device *wg302v1_d

        &wg302v1_eth[0],
  };
  
        &wg302v1_eth[0],
  };
  


@@ -37,7 +37,7 @@
  static void __init wg302v1_init(void)
  {
        ixp4xx_sys_init();
  static void __init wg302v1_init(void)
  {
        ixp4xx_sys_init();

-@@ -133,6 +163,7 @@
+@@ -133,6 +163,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1

        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,

diff --git a/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch
index 1faaa63be1881091a7f6d0abbfd827d967c2f84f..772b697aa27b8b1b95e5d3c5c2193b5a42e229c2 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/170-ixdpg425_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/coyote-setup.c
 +++ b/arch/arm/mach-ixp4xx/coyote-setup.c
 --- a/arch/arm/mach-ixp4xx/coyote-setup.c
 +++ b/arch/arm/mach-ixp4xx/coyote-setup.c

-@@ -73,9 +73,37 @@
+@@ -73,9 +73,37 @@ static struct platform_device coyote_uar

        .resource       = &coyote_uart_resource,
  };
  
        .resource       = &coyote_uart_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
index 1439985116584be03a17664ba2ea79d316a0e935..46198ac64ed002cd2c3cf8c7d0ac9e0151bbeeb5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/180-tw5334_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -158,6 +158,14 @@
+@@ -158,6 +158,14 @@ config ARCH_PRPMC1100

          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/IXP4xx>.
  
          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/IXP4xx>.
  


@@ -17,7 +17,7 @@
        prompt "NAS100D"
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
        prompt "NAS100D"
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ obj-pci-$(CONFIG_MACH_SIDEWINDER)    += sid

  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o


@@ -25,7 +25,7 @@
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -42,6 +43,7 @@
+@@ -42,6 +43,7 @@ obj-$(CONFIG_MACH_SIDEWINDER)        += sidewin

  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o
  obj-$(CONFIG_MACH_WRT300NV2)  += wrt300nv2-setup.o
  obj-$(CONFIG_MACH_AP1000)     += ap1000-setup.o


@@ -272,7 +272,7 @@
 +subsys_initcall(tw5334_pci_init);
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h
 +subsys_initcall(tw5334_pci_init);
 --- a/include/asm-arm/arch-ixp4xx/uncompress.h
 +++ b/include/asm-arm/arch-ixp4xx/uncompress.h

-@@ -42,7 +42,8 @@
+@@ -42,7 +42,8 @@ static __inline__ void __arch_decomp_set

         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||

diff --git a/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch
index 14555b48527c9c5810284d4f81205678f384d440..5daa9361823af108cfb50aba35066f741d65077f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/190-cambria_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -25,6 +25,14 @@
+@@ -25,6 +25,14 @@ config MACH_AVILA

          Avila Network Platform. For more information on this platform,
          see <file:Documentation/arm/IXP4xx>.
  
          Avila Network Platform. For more information on this platform,
          see <file:Documentation/arm/IXP4xx>.
  


@@ -15,7 +15,7 @@
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA
  config MACH_LOFT
      bool "Loft"
      depends on MACH_AVILA

-@@ -208,7 +216,7 @@
+@@ -208,7 +216,7 @@ config CPU_IXP46X

  
  config CPU_IXP43X
        bool
  
  config CPU_IXP43X
        bool


@@ -26,7 +26,7 @@
  config MACH_GTWX5715
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
  config MACH_GTWX5715
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -7,6 +7,7 @@
+@@ -7,6 +7,7 @@ obj-pci-n      :=

  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o
  
  obj-pci-$(CONFIG_ARCH_IXDP4XX)                += ixdp425-pci.o
  obj-pci-$(CONFIG_MACH_AVILA)          += avila-pci.o


@@ -34,7 +34,7 @@
  obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o
  obj-pci-$(CONFIG_MACH_IXDPG425)               += ixdpg425-pci.o
  obj-pci-$(CONFIG_ARCH_ADI_COYOTE)     += coyote-pci.o
  obj-pci-$(CONFIG_MACH_GTWX5715)               += gtwx5715-pci.o

-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-y        += common.o

  
  obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)      += avila-setup.o
  
  obj-$(CONFIG_ARCH_IXDP4XX)    += ixdp425-setup.o
  obj-$(CONFIG_MACH_AVILA)      += avila-setup.o

diff --git a/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
index 237c6b3e0a48ee3758b1df14aedab15968b6f6f8..c93e446d40e49276435a3f622c879b3e38cd4a59 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/191-cambria_optional_uart.patch
@@ -8,7 +8,7 @@
  
  struct cambria_board_info {
        unsigned char   *model;
  
  struct cambria_board_info {
        unsigned char   *model;

-@@ -105,6 +106,43 @@
+@@ -105,6 +106,43 @@ static struct platform_device cambria_ua

        .resource       = &cambria_uart_resource,
  };
  
        .resource       = &cambria_uart_resource,
  };
  


@@ -52,7 +52,7 @@
  static struct resource cambria_pata_resources[] = {
        {
                .flags  = IORESOURCE_MEM
  static struct resource cambria_pata_resources[] = {
        {
                .flags  = IORESOURCE_MEM

-@@ -287,6 +325,19 @@
+@@ -287,6 +325,19 @@ static void __init cambria_gw23xx_setup(

  #ifdef CONFIG_SENSORS_EEPROM
  static void __init cambria_gw2350_setup(void)
  {
  #ifdef CONFIG_SENSORS_EEPROM
  static void __init cambria_gw2350_setup(void)
  {


@@ -72,7 +72,7 @@
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);
  
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);
  

-@@ -294,10 +345,26 @@
+@@ -294,10 +345,26 @@ static void __init cambria_gw2350_setup(

        platform_device_register(&cambria_usb1_device);
  
        platform_device_register(&cambria_gpio_leds_device);
        platform_device_register(&cambria_usb1_device);
  
        platform_device_register(&cambria_gpio_leds_device);

diff --git a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
index 157e1f16982eb67d655fc8b7fd86b90dbeae4d5b..a9ade59399fb3dddb95fae865cba82a30914ccf5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
 --- a/arch/arm/mach-ixp4xx/cambria-setup.c
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c

-@@ -214,6 +214,21 @@
+@@ -214,6 +214,21 @@ static struct platform_device cambria_gp

        .dev.platform_data = &cambria_gpio_leds_data,
  };
  
        .dev.platform_data = &cambria_gpio_leds_data,
  };
  


@@ -22,7 +22,7 @@
  
  static struct latch_led cambria_latch_leds[] = {
        {
  
  static struct latch_led cambria_latch_leds[] = {
        {

-@@ -337,6 +352,11 @@
+@@ -337,6 +352,11 @@ static void __init cambria_gw2350_setup(

        cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  
        cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53FF0000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  


@@ -34,7 +34,7 @@
        platform_device_register(&cambria_optional_uart);
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);
        platform_device_register(&cambria_optional_uart);
        platform_device_register(&cambria_npec_device);
        platform_device_register(&cambria_npea_device);

-@@ -363,6 +383,10 @@
+@@ -363,6 +383,10 @@ static void __init cambria_gw2358_setup(

        cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53F80000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  
        cambria_optional_uart_data[1].membase   = (void __iomem *)ioremap(0x53F80000, 0x0fff);
        cambria_optional_uart_data[1].irq               = IRQ_IXP4XX_GPIO4;
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch b/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch
index a4c031aca141eae7cf52b143667daa252a268457..64c17984574aa056ebf864d0e1f9ec0b8427c659 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/201-npe_driver_print_license_location.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c

-@@ -592,6 +592,8 @@
+@@ -592,6 +592,8 @@ int npe_load_firmware(struct npe *npe, c

        npe_reset(npe);
  #endif
  
        npe_reset(npe);
  #endif
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch
index f0be25315a880834bdc3e29e1a607dc787b9793e..8f75415145d49a2cbcb1280b05ced27ebf5353c5 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/202-npe_driver_switch_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c

-@@ -165,14 +165,15 @@
+@@ -165,14 +165,15 @@ struct port {

        struct net_device *netdev;
        struct napi_struct napi;
        struct net_device_stats stat;
        struct net_device *netdev;
        struct napi_struct napi;
        struct net_device_stats stat;


@@ -18,7 +18,7 @@
  };
  
  /* NPE message structure */
  };
  
  /* NPE message structure */

-@@ -316,12 +317,13 @@
+@@ -316,12 +317,13 @@ static void mdio_write(struct net_device

        spin_unlock_irqrestore(&mdio_lock, flags);
  }
  
        spin_unlock_irqrestore(&mdio_lock, flags);
  }
  


@@ -34,7 +34,7 @@
  
        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
  
        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {

-@@ -335,12 +337,12 @@
+@@ -335,12 +337,12 @@ static void phy_reset(struct net_device 

                cycles++;
        }
  
                cycles++;
        }
  


@@ -50,7 +50,7 @@
                __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
                             &port->regs->tx_control[0]);
        else
                __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
                             &port->regs->tx_control[0]);
        else

-@@ -348,7 +350,7 @@
+@@ -348,7 +350,7 @@ static void eth_set_duplex(struct port *

                             &port->regs->tx_control[0]);
  }
  
                             &port->regs->tx_control[0]);
  }
  


@@ -59,7 +59,7 @@
  static void phy_check_media(struct port *port, int init)
  {
        if (mii_check_media(&port->mii, 1, init))
  static void phy_check_media(struct port *port, int init)
  {
        if (mii_check_media(&port->mii, 1, init))

-@@ -367,7 +369,63 @@
+@@ -367,7 +369,63 @@ static void phy_check_media(struct port 

                }
        }
  }
                }
        }
  }


@@ -123,7 +123,7 @@
  
  static void mdio_thread(struct work_struct *work)
  {
  
  static void mdio_thread(struct work_struct *work)
  {

-@@ -792,9 +850,12 @@
+@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device *

  
        if (!netif_running(dev))
                return -EINVAL;
  
        if (!netif_running(dev))
                return -EINVAL;


@@ -138,7 +138,7 @@
        return err;
  }
  
        return err;
  }
  

-@@ -947,7 +1008,8 @@
+@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d

                }
        }
  
                }
        }
  


@@ -148,7 +148,7 @@
  
        memset(&msg, 0, sizeof(msg));
        msg.cmd = NPE_VLAN_SETRXQOSENTRY;
  
        memset(&msg, 0, sizeof(msg));
        msg.cmd = NPE_VLAN_SETRXQOSENTRY;

-@@ -1107,10 +1169,8 @@
+@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device *

                printk(KERN_CRIT "%s: unable to disable loopback\n",
                       dev->name);
  
                printk(KERN_CRIT "%s: unable to disable loopback\n",
                       dev->name);
  


@@ -161,7 +161,7 @@
  
        if (!ports_open)
                qmgr_disable_irq(TXDONE_QUEUE);
  
        if (!ports_open)
                qmgr_disable_irq(TXDONE_QUEUE);

-@@ -1120,6 +1180,42 @@
+@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device *

        return 0;
  }
  
        return 0;
  }
  


@@ -204,7 +204,7 @@
  static int __devinit eth_init_one(struct platform_device *pdev)
  {
        struct port *port;
  static int __devinit eth_init_one(struct platform_device *pdev)
  {
        struct port *port;

-@@ -1192,20 +1288,7 @@
+@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct

        __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
        udelay(50);
  
        __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
        udelay(50);
  


@@ -228,7 +228,7 @@
        return 0;
 --- a/include/asm-arm/arch-ixp4xx/platform.h
 +++ b/include/asm-arm/arch-ixp4xx/platform.h
        return 0;
 --- a/include/asm-arm/arch-ixp4xx/platform.h
 +++ b/include/asm-arm/arch-ixp4xx/platform.h

-@@ -95,12 +95,15 @@
+@@ -95,12 +95,15 @@ struct sys_timer;

  #define IXP4XX_ETH_NPEB               0x10
  #define IXP4XX_ETH_NPEC               0x20
  
  #define IXP4XX_ETH_NPEB               0x10
  #define IXP4XX_ETH_NPEC               0x20
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
index 699763f518db14c3b08fcb03527e4e523eaac62b..b6519f034332d3ff2a68aff177a9c61070a1bf9e 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/203-npe_driver_phy_reset_autoneg.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c

-@@ -322,8 +322,12 @@
+@@ -322,8 +322,12 @@ static void phy_reset(struct net_device 

        struct port *port = netdev_priv(dev);
        int phy_id = port->mii[idx].phy_id;
        int cycles = 0;
        struct port *port = netdev_priv(dev);
        int phy_id = port->mii[idx].phy_id;
        int cycles = 0;


@@ -14,7 +14,7 @@
  
        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
  
        while (cycles < MAX_MII_RESET_RETRIES) {
                if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {

-@@ -331,13 +335,23 @@
+@@ -331,13 +335,23 @@ static void phy_reset(struct net_device 

                        printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
                               dev->name, cycles);
  #endif
                        printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
                               dev->name, cycles);
  #endif

diff --git a/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch b/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch
index 932fae582f957dc519adfb4b37610f2cbaeb8a92..4cefc4427d8cabb89baca9634e00bfa84cb3d6e3 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/204-npe_driver_ixp43x_support.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
 
 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 
 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c

-@@ -575,8 +575,8 @@
+@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, c

                for (i = 0; i < image->size; i++)
                        image->data[i] = swab32(image->data[i]);
  
                for (i = 0; i < image->size; i++)
                        image->data[i] = swab32(image->data[i]);
  


@@ -23,7 +23,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
                          "IXP42x\n");
                goto err;
        }
                          "IXP42x\n");
                goto err;
        }

-@@ -598,7 +598,7 @@
+@@ -598,7 +598,7 @@ int npe_load_firmware(struct npe *npe, c

                  "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
                  (image->id >> 8) & 0xFF, image->id & 0xFF);
  
                  "revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
                  (image->id >> 8) & 0xFF, image->id & 0xFF);
  


@@ -42,7 +42,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
  #include <asm/arch/npe.h>
  #include <asm/arch/qmgr.h>
  
  #include <asm/arch/npe.h>
  #include <asm/arch/qmgr.h>
  

-@@ -1338,12 +1339,16 @@
+@@ -1338,12 +1339,16 @@ static struct platform_driver drv = {

  
  static int __init eth_init_module(void)
  {
  
  static int __init eth_init_module(void)
  {


@@ -65,7 +65,7 @@ Subject: [PATCH] Add support for the ethernet ports on IXP43x
        return platform_driver_register(&drv);
 --- a/include/asm-arm/arch-ixp4xx/cpu.h
 +++ b/include/asm-arm/arch-ixp4xx/cpu.h
        return platform_driver_register(&drv);
 --- a/include/asm-arm/arch-ixp4xx/cpu.h
 +++ b/include/asm-arm/arch-ixp4xx/cpu.h

-@@ -34,6 +34,8 @@
+@@ -34,6 +34,8 @@ static inline u32 ixp4xx_read_feature_bi

        val &= ~IXP4XX_FEATURE_RESERVED;
        if (!cpu_is_ixp46x())
                val &= ~IXP4XX_FEATURE_IXP46X_ONLY;
        val &= ~IXP4XX_FEATURE_RESERVED;
        if (!cpu_is_ixp46x())
                val &= ~IXP4XX_FEATURE_IXP46X_ONLY;

diff --git a/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch b/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch
index d20ae7254e39f2ef35cd59fe3fa9352e8b294a7f..b75cfc898b59f8f4646ea640a298c4421f7db341 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/210-npe_hss.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wan/Kconfig
 +++ b/drivers/net/wan/Kconfig
 --- a/drivers/net/wan/Kconfig
 +++ b/drivers/net/wan/Kconfig

-@@ -336,6 +336,15 @@
+@@ -336,6 +336,15 @@ config DSCC4_PCI_RST

  
          Say Y if your card supports this feature.
  
  
          Say Y if your card supports this feature.
  


@@ -18,7 +18,7 @@
        ---help---
 --- a/drivers/net/wan/Makefile
 +++ b/drivers/net/wan/Makefile
        ---help---
 --- a/drivers/net/wan/Makefile
 +++ b/drivers/net/wan/Makefile

-@@ -42,6 +42,7 @@
+@@ -42,6 +42,7 @@ obj-$(CONFIG_C101)           += c101.o

  obj-$(CONFIG_WANXL)           += wanxl.o
  obj-$(CONFIG_PCI200SYN)               += pci200syn.o
  obj-$(CONFIG_PC300TOO)                += pc300too.o
  obj-$(CONFIG_WANXL)           += wanxl.o
  obj-$(CONFIG_PCI200SYN)               += pci200syn.o
  obj-$(CONFIG_PC300TOO)                += pc300too.o

diff --git a/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch
index 1f48980523ea8e91242428d71dafdfeb113868ec..1cf1f9ab025c943efcc64216c5288320b83da996 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/294-eeprom_new_notifier.patch
@@ -9,7 +9,7 @@
  
  /* Addresses to scan */
  static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
  
  /* Addresses to scan */
  static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,

-@@ -41,26 +43,7 @@
+@@ -41,26 +43,7 @@ static const unsigned short normal_i2c[]

  /* Insmod parameters */
  I2C_CLIENT_INSMOD_1(eeprom);
  
  /* Insmod parameters */
  I2C_CLIENT_INSMOD_1(eeprom);
  


@@ -37,7 +37,7 @@
  
  static int eeprom_attach_adapter(struct i2c_adapter *adapter);
  static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);
  
  static int eeprom_attach_adapter(struct i2c_adapter *adapter);
  static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind);

-@@ -197,6 +180,7 @@
+@@ -197,6 +180,7 @@ static int eeprom_detect(struct i2c_adap

        data->valid = 0;
        mutex_init(&data->update_lock);
        data->nature = UNKNOWN;
        data->valid = 0;
        mutex_init(&data->update_lock);
        data->nature = UNKNOWN;


@@ -45,7 +45,7 @@
  
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))
  
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))

-@@ -224,6 +208,9 @@
+@@ -224,6 +208,9 @@ static int eeprom_detect(struct i2c_adap

        if (err)
                goto exit_detach;
  
        if (err)
                goto exit_detach;
  


@@ -55,7 +55,7 @@
        return 0;
  
  exit_detach:
        return 0;
  
  exit_detach:

-@@ -249,6 +236,41 @@
+@@ -249,6 +236,41 @@ static int eeprom_detach_client(struct i

        return 0;
  }
  
        return 0;
  }
  


@@ -173,7 +173,7 @@
 +#endif /* _LINUX_EEPROM_H */
 --- a/include/linux/notifier.h
 +++ b/include/linux/notifier.h
 +#endif /* _LINUX_EEPROM_H */
 --- a/include/linux/notifier.h
 +++ b/include/linux/notifier.h

-@@ -253,5 +253,8 @@
+@@ -253,5 +253,8 @@ extern struct blocking_notifier_head reb

  #define VT_UPDATE             0x0004 /* A bigger update occurred */
  #define VT_PREWRITE           0x0005 /* A char is about to be written to the console */
  
  #define VT_UPDATE             0x0004 /* A bigger update occurred */
  #define VT_PREWRITE           0x0005 /* A char is about to be written to the console */
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch b/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch
index d1f320f443ddbe6f697f7c26fac25c5e90626ae0..93fc7cdeb52effbdddd290b1ab757816ae01a768 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/295-latch_led_driver.patch
@@ -1,6 +1,6 @@
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig

-@@ -117,6 +117,12 @@
+@@ -117,6 +117,12 @@ config LEDS_GPIO

          outputs. To be useful the particular board must have LEDs
          and they must be connected to the GPIO lines.
  
          outputs. To be useful the particular board must have LEDs
          and they must be connected to the GPIO lines.
  


@@ -159,7 +159,7 @@
 +MODULE_LICENSE("GPL");
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
 +MODULE_LICENSE("GPL");
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile

-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ obj-$(CONFIG_LEDS_H1940)             += leds-h1940.

  obj-$(CONFIG_LEDS_COBALT_QUBE)                += leds-cobalt-qube.o
  obj-$(CONFIG_LEDS_COBALT_RAQ)         += leds-cobalt-raq.o
  obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
  obj-$(CONFIG_LEDS_COBALT_QUBE)                += leds-cobalt-qube.o
  obj-$(CONFIG_LEDS_COBALT_RAQ)         += leds-cobalt-raq.o
  obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o


@@ -169,7 +169,7 @@
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h
  obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h

-@@ -134,5 +134,18 @@
+@@ -134,5 +134,18 @@ struct gpio_led_platform_data {

                                        unsigned long *delay_off);
  };
  
                                        unsigned long *delay_off);
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch
index c1c584c6121dcc7f1c61f7d204872a19914ec871..8ea879fad8f315d122ee63251cf5a6c02bc1e113 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/296-avila_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c

-@@ -132,6 +132,31 @@
+@@ -132,6 +132,31 @@ static struct platform_device avila_pata

        .resource               = avila_pata_resources,
  };
  
        .resource               = avila_pata_resources,
  };
  


@@ -32,7 +32,7 @@
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,

-@@ -159,6 +184,8 @@
+@@ -159,6 +184,8 @@ static void __init avila_init(void)

  
        platform_device_register(&avila_pata);
  
  
        platform_device_register(&avila_pata);
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch
index db25efbea60662401bb4bf9a9655473dd512d41f..aef7558dc4eba58352f93dd6e2c578cf8aac2a8b 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/300-avila_fetch_mac.patch
@@ -33,7 +33,7 @@
  static struct flash_platform_data avila_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,
  static struct flash_platform_data avila_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,

-@@ -163,10 +178,160 @@
+@@ -163,10 +178,160 @@ static struct platform_device *avila_dev

        &avila_uart
  };
  
        &avila_uart
  };
  


@@ -194,7 +194,7 @@
        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        avila_flash_resource.end =
                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
        avila_flash_resource.end =
                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;

-@@ -184,9 +349,28 @@
+@@ -184,9 +349,28 @@ static void __init avila_init(void)

  
        platform_device_register(&avila_pata);
  
  
        platform_device_register(&avila_pata);
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch b/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch
index 7a079f537a76c623d7bb5599bd3cf13406255b67..81e9826bfb22bb439ad0526f41648f402be7c855 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/301-avila_led.patch
@@ -8,7 +8,7 @@
  #include <linux/i2c-gpio.h>
  
  #include <asm/types.h>
  #include <linux/i2c-gpio.h>
  
  #include <asm/types.h>

-@@ -172,6 +173,72 @@
+@@ -172,6 +173,72 @@ static struct platform_device avila_npec

        .dev.platform_data      = &avila_npec_data,
  };
  
        .dev.platform_data      = &avila_npec_data,
  };
  


@@ -81,7 +81,7 @@
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,
  static struct platform_device *avila_devices[] __initdata = {
        &avila_i2c_gpio,
        &avila_flash,

-@@ -182,6 +249,8 @@
+@@ -182,6 +249,8 @@ static void __init avila_gw23xx_setup(vo

  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);
  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);


@@ -90,7 +90,7 @@
  }
  
  #ifdef CONFIG_SENSORS_EEPROM
  }
  
  #ifdef CONFIG_SENSORS_EEPROM

-@@ -189,6 +258,8 @@
+@@ -189,6 +258,8 @@ static void __init avila_gw2342_setup(vo

  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);
  {
        platform_device_register(&avila_npeb_device);
        platform_device_register(&avila_npec_device);


@@ -99,7 +99,7 @@
  }
  
  static void __init avila_gw2345_setup(void)
  }
  
  static void __init avila_gw2345_setup(void)

-@@ -199,22 +270,30 @@
+@@ -199,22 +270,30 @@ static void __init avila_gw2345_setup(vo

  
        avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
        platform_device_register(&avila_npec_device);
  
        avila_npec_data.phy = 5; /* port 5 of the KS8995 switch */
        platform_device_register(&avila_npec_device);


@@ -130,7 +130,7 @@
  }
  
  static void __init avila_gw2355_setup(void)
  }
  
  static void __init avila_gw2355_setup(void)

-@@ -225,11 +304,29 @@
+@@ -225,11 +304,29 @@ static void __init avila_gw2355_setup(vo

  
        avila_npec_data.phy = 16;
        platform_device_register(&avila_npec_device);
  
        avila_npec_data.phy = 16;
        platform_device_register(&avila_npec_device);

diff --git a/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch
index 53b8b632a6a823ad74124defbd40eba42e643bc0..38d9ab2a8c36d09f163dab8b1ec3a28d9b50fe06 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/302-avila_gpio_device.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c

-@@ -239,10 +239,28 @@
+@@ -239,10 +239,28 @@ static struct platform_device avila_latc

        .dev.platform_data      = &avila_latch_leds_data,
  };
  
        .dev.platform_data      = &avila_latch_leds_data,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch
index ece08fd171f83a78954ca0a433e75aab5d91d3af..cb54c3411242f58fc7d7e428f32a4510ccbe7abe 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/303-avila_gw23x7_phy_quirk.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c
 --- a/arch/arm/mach-ixp4xx/avila-setup.c
 +++ b/arch/arm/mach-ixp4xx/avila-setup.c

-@@ -294,6 +294,7 @@
+@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo

  
  static void __init avila_gw2347_setup(void)
  {
  
  static void __init avila_gw2347_setup(void)
  {


@@ -8,7 +8,7 @@
        platform_device_register(&avila_npeb_device);
  
        avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
        platform_device_register(&avila_npeb_device);
  
        avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;

-@@ -338,6 +339,7 @@
+@@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo

  
  static void __init avila_gw2357_setup(void)
  {
  
  static void __init avila_gw2357_setup(void)
  {


@@ -18,7 +18,7 @@
        avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
        avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO;
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c

-@@ -348,6 +348,14 @@
+@@ -348,6 +348,14 @@ static void phy_reset(struct net_device 

                return;
        }
  
                return;
        }
  


@@ -35,7 +35,7 @@
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
 --- a/include/asm-arm/arch-ixp4xx/platform.h
 +++ b/include/asm-arm/arch-ixp4xx/platform.h
        bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART);
 --- a/include/asm-arm/arch-ixp4xx/platform.h
 +++ b/include/asm-arm/arch-ixp4xx/platform.h

-@@ -104,6 +104,8 @@
+@@ -104,6 +104,8 @@ struct eth_plat_info {

        u8 txreadyq;
        u8 hwaddr[6];
        u32 phy_mask;
        u8 txreadyq;
        u8 hwaddr[6];
        u32 phy_mask;

diff --git a/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch b/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch
index 688085291c7a80f452ec1c650fdecd532f2ddff4..550b54fd3395e6cb4152a3a2f4db648b012b8ca4 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/310-gtwx5717_spi_bus.patch
@@ -9,7 +9,7 @@
  #include <asm/types.h>
  #include <asm/setup.h>
  #include <asm/memory.h>
  #include <asm/types.h>
  #include <asm/setup.h>
  #include <asm/memory.h>

-@@ -121,9 +123,41 @@
+@@ -121,9 +123,41 @@ static struct platform_device gtwx5715_f

        .resource       = &gtwx5715_flash_resource,
  };
  
        .resource       = &gtwx5715_flash_resource,
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch
index 90f750e7a92579ebfa25922fb83925e4ff85b0f3..29f329017ede286116b3df7c0099e6ac2479b1ce 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/311-gtwx5717_mac_plat_info.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
 +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
 +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c

-@@ -154,10 +154,37 @@
+@@ -154,10 +154,37 @@ static struct platform_device gtwx5715_s

        },
  };
  
        },
  };
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch b/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch
index 86a1cea9e2c3237f6b43bc28c3b0d0f123760e4c..d6489a7fb801d38d6ba6590284cec05459fb2e43 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/312-ixp4xx_pata_optimization.patch
@@ -63,7 +63,7 @@
                        dev->xfer_shift = ATA_SHIFT_PIO;
                        dev->flags |= ATA_DFLAG_PIO;
                }
                        dev->xfer_shift = ATA_SHIFT_PIO;
                        dev->flags |= ATA_DFLAG_PIO;
                }

-@@ -48,6 +89,7 @@
+@@ -48,6 +89,7 @@ static unsigned int ixp4xx_mmio_data_xfe

        unsigned int i;
        unsigned int words = buflen >> 1;
        u16 *buf16 = (u16 *) buf;
        unsigned int i;
        unsigned int words = buflen >> 1;
        u16 *buf16 = (u16 *) buf;


@@ -71,7 +71,7 @@
        struct ata_port *ap = dev->link->ap;
        void __iomem *mmio = ap->ioaddr.data_addr;
        struct ixp4xx_pata_data *data = ap->host->dev->platform_data;
        struct ata_port *ap = dev->link->ap;
        void __iomem *mmio = ap->ioaddr.data_addr;
        struct ixp4xx_pata_data *data = ap->host->dev->platform_data;

-@@ -55,8 +97,34 @@
+@@ -55,8 +97,34 @@ static unsigned int ixp4xx_mmio_data_xfe

        /* set the expansion bus in 16bit mode and restore
         * 8 bit mode after the transaction.
         */
        /* set the expansion bus in 16bit mode and restore
         * 8 bit mode after the transaction.
         */


@@ -108,7 +108,7 @@
  
        /* Transfer multiple of 2 bytes */
        if (rw == READ)
  
        /* Transfer multiple of 2 bytes */
        if (rw == READ)

-@@ -81,8 +149,24 @@
+@@ -81,8 +149,24 @@ static unsigned int ixp4xx_mmio_data_xfe

                words++;
        }
  
                words++;
        }
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch b/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch
index 8d2b4c7a73dbb6103779bdfea01171683d23aff2..2fc1890c89331a655a2323bbd31ebeee35a31d4a 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/400-dmabounce.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/common/dmabounce.c
 +++ b/arch/arm/common/dmabounce.c
 --- a/arch/arm/common/dmabounce.c
 +++ b/arch/arm/common/dmabounce.c

-@@ -117,6 +117,10 @@
+@@ -117,6 +117,10 @@ alloc_safe_buffer(struct dmabounce_devic

        } else if (size <= device_info->large.size) {
                pool = &device_info->large;
        } else {
        } else if (size <= device_info->large.size) {
                pool = &device_info->large;
        } else {


@@ -13,7 +13,7 @@
  
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
  
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -244,6 +244,11 @@
+@@ -244,6 +244,11 @@ config DMABOUNCE

        default y
        depends on PCI
  
        default y
        depends on PCI
  

diff --git a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
index 7af0732258d0d6c701664715c1069168f575c731..b6d5d22cabc846f5edd531ffe804d97233a925fe 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/500-usr8200_support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Kconfig
-===================================================================
---- linux-2.6.26.5.orig/arch/arm/mach-ixp4xx/Kconfig   2008-10-22 22:31:30.000000000 +0100
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/Kconfig        2008-10-22 22:40:55.000000000 +0100
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig

 @@ -97,6 +97,14 @@ config MACH_SIDEWINDER
          Engineering Sidewinder board. For more information on this
          platform, see http://www.adiengineering.com
 @@ -97,6 +97,14 @@ config MACH_SIDEWINDER
          Engineering Sidewinder board. For more information on this
          platform, see http://www.adiengineering.com


@@ -17,10 +15,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Kconfig
  config MACH_COMPEX
        bool "Compex WP18 / NP18A"
        select PCI
  config MACH_COMPEX
        bool "Compex WP18 / NP18A"
        select PCI

-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Makefile
-===================================================================
---- linux-2.6.26.5.orig/arch/arm/mach-ixp4xx/Makefile  2008-10-22 22:31:37.000000000 +0100
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/Makefile       2008-10-22 22:49:38.000000000 +0100
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile

 @@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX)                += ixdp42
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o
 @@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX)                += ixdp42
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_AP1000)         += ixdp425-pci.o


@@ -37,10 +33,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/Makefile
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o

-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-pci.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-pci.c  2008-10-22 23:37:56.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/usr8200-pci.c

 @@ -0,0 +1,78 @@
 +/*
 + * arch/arch/mach-ixp4xx/usr8200-pci.c
 @@ -0,0 +1,78 @@
 +/*
 + * arch/arch/mach-ixp4xx/usr8200-pci.c


@@ -120,10 +114,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-pci.c
 +}
 +
 +subsys_initcall(usr8200_pci_init);
 +}
 +
 +subsys_initcall(usr8200_pci_init);

-Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-setup.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-setup.c        2008-10-22 23:41:48.000000000 +0100
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/usr8200-setup.c

 @@ -0,0 +1,187 @@
 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c
 @@ -0,0 +1,187 @@
 +/*
 + * arch/arm/mach-ixp4xx/usr8200-setup.c


@@ -312,10 +304,8 @@ Index: linux-2.6.26.5/arch/arm/mach-ixp4xx/usr8200-setup.c
 +      .boot_params    = 0x0100,
 +      .init_machine   = usr8200_init,
 +MACHINE_END
 +      .boot_params    = 0x0100,
 +      .init_machine   = usr8200_init,
 +MACHINE_END

-Index: linux-2.6.26.5/include/asm-arm/arch-ixp4xx/uncompress.h
-===================================================================
---- linux-2.6.26.5.orig/include/asm-arm/arch-ixp4xx/uncompress.h       2008-10-22 23:27:33.000000000 +0100
-+++ linux-2.6.26.5/include/asm-arm/arch-ixp4xx/uncompress.h    2008-10-22 23:28:09.000000000 +0100
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h

 @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||
 @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
                         machine_is_gateway7001() || machine_is_wg302v2() ||

diff --git a/target/linux/magicbox/patches/001-magicbox_support.patch b/target/linux/magicbox/patches/001-magicbox_support.patch
index fe1221392f8ee8b58ddd67ec809e7ea91dfd0c66..984902f7a5044ae38ab9606cfc560e4e723aac44 100644 (file)
--- a/target/linux/magicbox/patches/001-magicbox_support.patch
+++ b/target/linux/magicbox/patches/001-magicbox_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/ppc/platforms/4xx/Kconfig
 +++ b/arch/ppc/platforms/4xx/Kconfig
 --- a/arch/ppc/platforms/4xx/Kconfig
 +++ b/arch/ppc/platforms/4xx/Kconfig

-@@ -53,6 +53,12 @@
+@@ -53,6 +53,12 @@ config WALNUT

        help
          This option enables support for the IBM PPC405GP evaluation board.
  
        help
          This option enables support for the IBM PPC405GP evaluation board.
  


@@ -13,7 +13,7 @@
  config XILINX_ML300
        bool "Xilinx-ML300"
        select XILINX_VIRTEX_II_PRO
  config XILINX_ML300
        bool "Xilinx-ML300"
        select XILINX_VIRTEX_II_PRO

-@@ -184,7 +190,7 @@
+@@ -184,7 +190,7 @@ config BOOKE

  
  config IBM_OCP
        bool
  
  config IBM_OCP
        bool


@@ -22,7 +22,7 @@
        default y
  
  config IBM_EMAC4
        default y
  
  config IBM_EMAC4

-@@ -194,7 +200,7 @@
+@@ -194,7 +200,7 @@ config IBM_EMAC4

  
  config BIOS_FIXUP
        bool
  
  config BIOS_FIXUP
        bool


@@ -31,7 +31,7 @@
        default y
  
  # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
        default y
  
  # OAK doesn't exist but wanted to keep this around for any future 403GCX boards

-@@ -205,7 +211,7 @@
+@@ -205,7 +211,7 @@ config 403GCX

  
  config 405EP
        bool
  
  config 405EP
        bool


@@ -42,7 +42,7 @@
  config 405GP
 --- a/arch/ppc/platforms/4xx/Makefile
 +++ b/arch/ppc/platforms/4xx/Makefile
  config 405GP
 --- a/arch/ppc/platforms/4xx/Makefile
 +++ b/arch/ppc/platforms/4xx/Makefile

-@@ -14,6 +14,7 @@
+@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6)              += redwood6.o

  obj-$(CONFIG_SYCAMORE)                += sycamore.o
  obj-$(CONFIG_TAISHAN)         += taishan.o
  obj-$(CONFIG_WALNUT)          += walnut.o
  obj-$(CONFIG_SYCAMORE)                += sycamore.o
  obj-$(CONFIG_TAISHAN)         += taishan.o
  obj-$(CONFIG_WALNUT)          += walnut.o

diff --git a/target/linux/magicbox/patches/100-cf_slot.patch b/target/linux/magicbox/patches/100-cf_slot.patch
index f6304b7b6b5dfb4348ae4e1ec43a471474fd9c3b..c37497342e9b4cf149a5f80d1abb5043495c4b19 100644 (file)
--- a/target/linux/magicbox/patches/100-cf_slot.patch
+++ b/target/linux/magicbox/patches/100-cf_slot.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ide/Kconfig
 +++ b/drivers/ide/Kconfig
 --- a/drivers/ide/Kconfig
 +++ b/drivers/ide/Kconfig

-@@ -928,6 +928,14 @@
+@@ -928,6 +928,14 @@ config BLK_DEV_MPC8xx_IDE

  
          If unsure, say N.
  
  
          If unsure, say N.
  

diff --git a/target/linux/orion/patches/000-orion_git_sync.patch b/target/linux/orion/patches/000-orion_git_sync.patch
index 4daef75d5b53f1a4f76bd683827f0ae22423dd14..283ec05558aa86ae0c965c1b6486ad3c6f7fddb0 100644 (file)
--- a/target/linux/orion/patches/000-orion_git_sync.patch
+++ b/target/linux/orion/patches/000-orion_git_sync.patch
@@ -1,6 +1,6 @@
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -2691,12 +2691,10 @@
+@@ -2691,12 +2691,10 @@ L:     libertas-dev@lists.infradead.org

  S:    Maintained
  
  MARVELL MV643XX ETHERNET DRIVER
  S:    Maintained
  
  MARVELL MV643XX ETHERNET DRIVER


@@ -18,7 +18,7 @@
  P:    Petr Vandrovec
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
  P:    Petr Vandrovec
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig

-@@ -84,6 +84,11 @@
+@@ -84,6 +84,11 @@ config STACKTRACE_SUPPORT

        bool
        default y
  
        bool
        default y
  


@@ -30,7 +30,7 @@
  config LOCKDEP_SUPPORT
        bool
        default y
  config LOCKDEP_SUPPORT
        bool
        default y

-@@ -347,6 +352,16 @@
+@@ -347,6 +352,16 @@ config ARCH_L7200

          If you have any questions or comments about the Linux kernel port
          to this board, send e-mail to <sjhill@cotw.com>.
  
          If you have any questions or comments about the Linux kernel port
          to this board, send e-mail to <sjhill@cotw.com>.
  


@@ -47,7 +47,7 @@
  config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
        select GENERIC_GPIO
  config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
        select GENERIC_GPIO

-@@ -365,6 +380,24 @@
+@@ -365,6 +380,24 @@ config ARCH_NS9XXX

  
          <http://www.digi.com/products/microprocessors/index.jsp>
  
  
          <http://www.digi.com/products/microprocessors/index.jsp>
  


@@ -72,7 +72,7 @@
  config ARCH_MXC
        bool "Freescale MXC/iMX-based"
        select ARCH_MTD_XIP
  config ARCH_MXC
        bool "Freescale MXC/iMX-based"
        select ARCH_MTD_XIP

-@@ -381,7 +414,8 @@
+@@ -381,7 +414,8 @@ config ARCH_ORION5X

        select PLAT_ORION
        help
          Support for the following Marvell Orion 5x series SoCs:
        select PLAT_ORION
        help
          Support for the following Marvell Orion 5x series SoCs:


@@ -82,7 +82,7 @@
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"

-@@ -502,6 +536,10 @@
+@@ -502,6 +536,10 @@ source "arch/arm/mach-ixp2000/Kconfig"

  
  source "arch/arm/mach-ixp23xx/Kconfig"
  
  
  source "arch/arm/mach-ixp23xx/Kconfig"
  


@@ -93,7 +93,7 @@
  source "arch/arm/mach-pxa/Kconfig"
  
  source "arch/arm/mach-sa1100/Kconfig"
  source "arch/arm/mach-pxa/Kconfig"
  
  source "arch/arm/mach-sa1100/Kconfig"

-@@ -514,6 +552,8 @@
+@@ -514,6 +552,8 @@ source "arch/arm/mach-omap2/Kconfig"

  
  source "arch/arm/mach-orion5x/Kconfig"
  
  
  source "arch/arm/mach-orion5x/Kconfig"
  


@@ -104,7 +104,7 @@
  
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
  
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile

-@@ -135,11 +135,14 @@
+@@ -135,11 +135,14 @@ endif

   machine-$(CONFIG_ARCH_NETX)     := netx
   machine-$(CONFIG_ARCH_NS9XXX)           := ns9xxx
   machine-$(CONFIG_ARCH_DAVINCI)          := davinci
   machine-$(CONFIG_ARCH_NETX)     := netx
   machine-$(CONFIG_ARCH_NS9XXX)           := ns9xxx
   machine-$(CONFIG_ARCH_DAVINCI)          := davinci


@@ -121,7 +121,7 @@
  # This is what happens if you forget the IOCS16 line.
 --- a/arch/arm/boot/compressed/head.S
 +++ b/arch/arm/boot/compressed/head.S
  # This is what happens if you forget the IOCS16 line.
 --- a/arch/arm/boot/compressed/head.S
 +++ b/arch/arm/boot/compressed/head.S

-@@ -623,8 +623,8 @@
+@@ -623,8 +623,8 @@ proc_types:

                b       __armv4_mmu_cache_off
                b       __armv4_mmu_cache_flush
  
                b       __armv4_mmu_cache_off
                b       __armv4_mmu_cache_flush
  


@@ -4171,7 +4171,7 @@
  #
  CONFIG_ARM=y
  CONFIG_SYS_SUPPORTS_APM_EMULATION=y
  #
  CONFIG_ARM=y
  CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y

  # CONFIG_ARCH_HAS_ILOG2_U64 is not set
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y
  # CONFIG_ARCH_HAS_ILOG2_U64 is not set
  CONFIG_GENERIC_HWEIGHT=y
  CONFIG_GENERIC_CALIBRATE_DELAY=y


@@ -4179,7 +4179,7 @@
  CONFIG_ZONE_DMA=y
  CONFIG_VECTORS_BASE=0xffff0000
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  CONFIG_ZONE_DMA=y
  CONFIG_VECTORS_BASE=0xffff0000
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

-@@ -40,24 +41,24 @@
+@@ -40,24 +41,24 @@ CONFIG_SYSVIPC_SYSCTL=y

  # CONFIG_POSIX_MQUEUE is not set
  # CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_TASKSTATS is not set
  # CONFIG_POSIX_MQUEUE is not set
  # CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_TASKSTATS is not set


@@ -4209,7 +4209,7 @@
  # CONFIG_KALLSYMS_EXTRA_PASS is not set
  CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
  # CONFIG_KALLSYMS_EXTRA_PASS is not set
  CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y

-@@ -73,20 +74,25 @@
+@@ -73,20 +74,25 @@ CONFIG_TIMERFD=y

  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
  CONFIG_VM_EVENT_COUNTERS=y
  CONFIG_EVENTFD=y
  CONFIG_SHMEM=y
  CONFIG_VM_EVENT_COUNTERS=y


@@ -4240,7 +4240,7 @@
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set

-@@ -111,7 +117,6 @@
+@@ -111,7 +117,6 @@ CONFIG_DEFAULT_CFQ=y

  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="cfq"
  CONFIG_CLASSIC_RCU=y
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="cfq"
  CONFIG_CLASSIC_RCU=y


@@ -4248,7 +4248,7 @@
  
  #
  # System Type
  
  #
  # System Type

-@@ -160,6 +165,7 @@
+@@ -160,6 +165,7 @@ CONFIG_MACH_RD88F5182=y

  CONFIG_MACH_KUROBOX_PRO=y
  CONFIG_MACH_DNS323=y
  CONFIG_MACH_TS209=y
  CONFIG_MACH_KUROBOX_PRO=y
  CONFIG_MACH_DNS323=y
  CONFIG_MACH_TS209=y


@@ -4256,7 +4256,7 @@
  
  #
  # Boot options
  
  #
  # Boot options

-@@ -168,6 +174,7 @@
+@@ -168,6 +174,7 @@ CONFIG_MACH_TS209=y

  #
  # Power management
  #
  #
  # Power management
  #


@@ -4264,7 +4264,7 @@
  
  #
  # Processor Type
  
  #
  # Processor Type

-@@ -177,8 +184,9 @@
+@@ -177,8 +184,9 @@ CONFIG_CPU_FEROCEON=y

  CONFIG_CPU_FEROCEON_OLD_ID=y
  CONFIG_CPU_32v5=y
  CONFIG_CPU_ABRT_EV5T=y
  CONFIG_CPU_FEROCEON_OLD_ID=y
  CONFIG_CPU_32v5=y
  CONFIG_CPU_ABRT_EV5T=y


@@ -4275,7 +4275,7 @@
  CONFIG_CPU_TLB_V4WBI=y
  CONFIG_CPU_CP15=y
  CONFIG_CPU_CP15_MMU=y
  CONFIG_CPU_TLB_V4WBI=y
  CONFIG_CPU_CP15=y
  CONFIG_CPU_CP15_MMU=y

-@@ -189,7 +197,6 @@
+@@ -189,7 +197,6 @@ CONFIG_CPU_CP15_MMU=y

  CONFIG_ARM_THUMB=y
  # CONFIG_CPU_ICACHE_DISABLE is not set
  # CONFIG_CPU_DCACHE_DISABLE is not set
  CONFIG_ARM_THUMB=y
  # CONFIG_CPU_ICACHE_DISABLE is not set
  # CONFIG_CPU_DCACHE_DISABLE is not set


@@ -4283,7 +4283,7 @@
  # CONFIG_OUTER_CACHE is not set
  
  #
  # CONFIG_OUTER_CACHE is not set
  
  #

-@@ -199,6 +206,7 @@
+@@ -199,6 +206,7 @@ CONFIG_PCI=y

  CONFIG_PCI_SYSCALL=y
  # CONFIG_ARCH_SUPPORTS_MSI is not set
  CONFIG_PCI_LEGACY=y
  CONFIG_PCI_SYSCALL=y
  # CONFIG_ARCH_SUPPORTS_MSI is not set
  CONFIG_PCI_LEGACY=y


@@ -4291,7 +4291,7 @@
  # CONFIG_PCCARD is not set
  
  #
  # CONFIG_PCCARD is not set
  
  #

-@@ -221,6 +229,7 @@
+@@ -221,6 +229,7 @@ CONFIG_FLATMEM=y

  CONFIG_FLAT_NODE_MEM_MAP=y
  # CONFIG_SPARSEMEM_STATIC is not set
  # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
  CONFIG_FLAT_NODE_MEM_MAP=y
  # CONFIG_SPARSEMEM_STATIC is not set
  # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set


@@ -4299,7 +4299,7 @@
  CONFIG_SPLIT_PTLOCK_CPUS=4096
  # CONFIG_RESOURCES_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_SPLIT_PTLOCK_CPUS=4096
  # CONFIG_RESOURCES_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1

-@@ -238,7 +247,6 @@
+@@ -238,7 +247,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0

  CONFIG_CMDLINE=""
  # CONFIG_XIP_KERNEL is not set
  # CONFIG_KEXEC is not set
  CONFIG_CMDLINE=""
  # CONFIG_XIP_KERNEL is not set
  # CONFIG_KEXEC is not set


@@ -4307,7 +4307,7 @@
  
  #
  # Floating point emulation
  
  #
  # Floating point emulation

-@@ -311,8 +319,6 @@
+@@ -311,8 +319,6 @@ CONFIG_TCP_CONG_CUBIC=y

  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
  # CONFIG_IPV6 is not set
  CONFIG_DEFAULT_TCP_CONG="cubic"
  # CONFIG_TCP_MD5SIG is not set
  # CONFIG_IPV6 is not set


@@ -4316,7 +4316,7 @@
  # CONFIG_NETWORK_SECMARK is not set
  # CONFIG_NETFILTER is not set
  # CONFIG_IP_DCCP is not set
  # CONFIG_NETWORK_SECMARK is not set
  # CONFIG_NETFILTER is not set
  # CONFIG_IP_DCCP is not set

-@@ -335,6 +341,7 @@
+@@ -335,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"

  # Network testing
  #
  CONFIG_NET_PKTGEN=m
  # Network testing
  #
  CONFIG_NET_PKTGEN=m


@@ -4324,7 +4324,7 @@
  # CONFIG_HAMRADIO is not set
  # CONFIG_CAN is not set
  # CONFIG_IRDA is not set
  # CONFIG_HAMRADIO is not set
  # CONFIG_CAN is not set
  # CONFIG_IRDA is not set

-@@ -362,6 +369,8 @@
+@@ -362,6 +369,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug

  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y


@@ -4333,7 +4333,7 @@
  # CONFIG_SYS_HYPERVISOR is not set
  # CONFIG_CONNECTOR is not set
  CONFIG_MTD=y
  # CONFIG_SYS_HYPERVISOR is not set
  # CONFIG_CONNECTOR is not set
  CONFIG_MTD=y

-@@ -371,6 +380,7 @@
+@@ -371,6 +380,7 @@ CONFIG_MTD_PARTITIONS=y

  # CONFIG_MTD_REDBOOT_PARTS is not set
  CONFIG_MTD_CMDLINE_PARTS=y
  # CONFIG_MTD_AFS_PARTS is not set
  # CONFIG_MTD_REDBOOT_PARTS is not set
  CONFIG_MTD_CMDLINE_PARTS=y
  # CONFIG_MTD_AFS_PARTS is not set


@@ -4341,7 +4341,7 @@
  
  #
  # User Modules And Translation Layers
  
  #
  # User Modules And Translation Layers

-@@ -378,9 +388,8 @@
+@@ -378,9 +388,8 @@ CONFIG_MTD_CMDLINE_PARTS=y

  CONFIG_MTD_CHAR=y
  CONFIG_MTD_BLKDEVS=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_CHAR=y
  CONFIG_MTD_BLKDEVS=y
  CONFIG_MTD_BLOCK=y


@@ -4353,7 +4353,7 @@
  # CONFIG_INFTL is not set
  # CONFIG_RFD_FTL is not set
  # CONFIG_SSFDC is not set
  # CONFIG_INFTL is not set
  # CONFIG_RFD_FTL is not set
  # CONFIG_SSFDC is not set

-@@ -405,12 +414,12 @@
+@@ -405,12 +414,12 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y

  # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
  CONFIG_MTD_CFI_I1=y
  CONFIG_MTD_CFI_I2=y
  # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
  CONFIG_MTD_CFI_I1=y
  CONFIG_MTD_CFI_I2=y


@@ -4368,7 +4368,7 @@
  CONFIG_MTD_CFI_UTIL=y
  # CONFIG_MTD_RAM is not set
  # CONFIG_MTD_ROM is not set
  CONFIG_MTD_CFI_UTIL=y
  # CONFIG_MTD_RAM is not set
  # CONFIG_MTD_ROM is not set

-@@ -481,6 +490,9 @@
+@@ -481,6 +490,9 @@ CONFIG_MISC_DEVICES=y

  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_SGI_IOC4 is not set
  # CONFIG_TIFM_CORE is not set
  # CONFIG_EEPROM_93CX6 is not set
  # CONFIG_SGI_IOC4 is not set
  # CONFIG_TIFM_CORE is not set


@@ -4378,7 +4378,7 @@
  
  #
  # SCSI device support
  
  #
  # SCSI device support

-@@ -542,6 +554,7 @@
+@@ -542,6 +554,7 @@ CONFIG_SCSI_LOWLEVEL=y

  # CONFIG_SCSI_IPS is not set
  # CONFIG_SCSI_INITIO is not set
  # CONFIG_SCSI_INIA100 is not set
  # CONFIG_SCSI_IPS is not set
  # CONFIG_SCSI_INITIO is not set
  # CONFIG_SCSI_INIA100 is not set


@@ -4386,7 +4386,7 @@
  # CONFIG_SCSI_STEX is not set
  # CONFIG_SCSI_SYM53C8XX_2 is not set
  # CONFIG_SCSI_IPR is not set
  # CONFIG_SCSI_STEX is not set
  # CONFIG_SCSI_SYM53C8XX_2 is not set
  # CONFIG_SCSI_IPR is not set

-@@ -556,7 +569,10 @@
+@@ -556,7 +569,10 @@ CONFIG_SCSI_LOWLEVEL=y

  # CONFIG_SCSI_SRP is not set
  CONFIG_ATA=y
  # CONFIG_ATA_NONSTANDARD is not set
  # CONFIG_SCSI_SRP is not set
  CONFIG_ATA=y
  # CONFIG_ATA_NONSTANDARD is not set


@@ -4397,7 +4397,7 @@
  # CONFIG_SATA_SVW is not set
  # CONFIG_ATA_PIIX is not set
  CONFIG_SATA_MV=y
  # CONFIG_SATA_SVW is not set
  # CONFIG_ATA_PIIX is not set
  CONFIG_SATA_MV=y

-@@ -566,7 +582,6 @@
+@@ -566,7 +582,6 @@ CONFIG_SATA_MV=y

  # CONFIG_SATA_PROMISE is not set
  # CONFIG_SATA_SX4 is not set
  # CONFIG_SATA_SIL is not set
  # CONFIG_SATA_PROMISE is not set
  # CONFIG_SATA_SX4 is not set
  # CONFIG_SATA_SIL is not set


@@ -4405,7 +4405,7 @@
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set
  # CONFIG_SATA_VIA is not set
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set
  # CONFIG_SATA_VIA is not set

-@@ -611,6 +626,7 @@
+@@ -611,6 +626,7 @@ CONFIG_SATA_MV=y

  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
  # CONFIG_PATA_PLATFORM is not set
  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
  # CONFIG_PATA_PLATFORM is not set


@@ -4413,7 +4413,7 @@
  # CONFIG_MD is not set
  # CONFIG_FUSION is not set
  
  # CONFIG_MD is not set
  # CONFIG_FUSION is not set
  

-@@ -652,7 +668,7 @@
+@@ -652,7 +668,7 @@ CONFIG_NET_PCI=y

  # CONFIG_B44 is not set
  # CONFIG_FORCEDETH is not set
  # CONFIG_EEPRO100 is not set
  # CONFIG_B44 is not set
  # CONFIG_FORCEDETH is not set
  # CONFIG_EEPRO100 is not set


@@ -4422,7 +4422,7 @@
  # CONFIG_FEALNX is not set
  # CONFIG_NATSEMI is not set
  # CONFIG_NE2K_PCI is not set
  # CONFIG_FEALNX is not set
  # CONFIG_NATSEMI is not set
  # CONFIG_NE2K_PCI is not set

-@@ -668,9 +684,7 @@
+@@ -668,9 +684,7 @@ CONFIG_E100=y

  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set


@@ -4433,7 +4433,7 @@
  # CONFIG_E1000E is not set
  # CONFIG_E1000E_ENABLED is not set
  # CONFIG_IP1000 is not set
  # CONFIG_E1000E is not set
  # CONFIG_E1000E_ENABLED is not set
  # CONFIG_IP1000 is not set

-@@ -680,27 +694,15 @@
+@@ -680,27 +694,15 @@ CONFIG_E1000_NAPI=y

  # CONFIG_YELLOWFIN is not set
  # CONFIG_R8169 is not set
  # CONFIG_SIS190 is not set
  # CONFIG_YELLOWFIN is not set
  # CONFIG_R8169 is not set
  # CONFIG_SIS190 is not set


@@ -4465,7 +4465,7 @@
  # CONFIG_TR is not set
  
  #
  # CONFIG_TR is not set
  
  #

-@@ -708,6 +710,7 @@
+@@ -708,6 +710,7 @@ CONFIG_NETDEV_10000=y

  #
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  #
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set


@@ -4473,7 +4473,7 @@
  
  #
  # USB Network Adapters
  
  #
  # USB Network Adapters

-@@ -738,12 +741,9 @@
+@@ -738,12 +741,9 @@ CONFIG_INPUT=y

  #
  # Userland interfaces
  #
  #
  # Userland interfaces
  #


@@ -4488,7 +4488,7 @@
  # CONFIG_INPUT_EVBUG is not set
  
  #
  # CONFIG_INPUT_EVBUG is not set
  
  #

-@@ -765,10 +765,8 @@
+@@ -765,10 +765,8 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

  #
  # Character devices
  #
  #
  # Character devices
  #


@@ -4501,7 +4501,7 @@
  # CONFIG_SERIAL_NONSTANDARD is not set
  # CONFIG_NOZOMI is not set
  
  # CONFIG_SERIAL_NONSTANDARD is not set
  # CONFIG_NOZOMI is not set
  

-@@ -777,7 +775,7 @@
+@@ -777,7 +775,7 @@ CONFIG_HW_CONSOLE=y

  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
  #
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y


@@ -4510,7 +4510,7 @@
  CONFIG_SERIAL_8250_NR_UARTS=4
  CONFIG_SERIAL_8250_RUNTIME_UARTS=2
  # CONFIG_SERIAL_8250_EXTENDED is not set
  CONFIG_SERIAL_8250_NR_UARTS=4
  CONFIG_SERIAL_8250_RUNTIME_UARTS=2
  # CONFIG_SERIAL_8250_EXTENDED is not set

-@@ -792,7 +790,7 @@
+@@ -792,7 +790,7 @@ CONFIG_UNIX98_PTYS=y

  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=16
  # CONFIG_IPMI_HANDLER is not set
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=16
  # CONFIG_IPMI_HANDLER is not set


@@ -4519,7 +4519,7 @@
  # CONFIG_NVRAM is not set
  # CONFIG_R3964 is not set
  # CONFIG_APPLICOM is not set
  # CONFIG_NVRAM is not set
  # CONFIG_R3964 is not set
  # CONFIG_APPLICOM is not set

-@@ -804,13 +802,6 @@
+@@ -804,13 +802,6 @@ CONFIG_I2C_BOARDINFO=y

  CONFIG_I2C_CHARDEV=y
  
  #
  CONFIG_I2C_CHARDEV=y
  
  #


@@ -4533,7 +4533,7 @@
  # I2C Hardware Bus support
  #
  # CONFIG_I2C_ALI1535 is not set
  # I2C Hardware Bus support
  #
  # CONFIG_I2C_ALI1535 is not set

-@@ -837,6 +828,7 @@
+@@ -837,6 +828,7 @@ CONFIG_I2C_CHARDEV=y

  # CONFIG_I2C_VIA is not set
  # CONFIG_I2C_VIAPRO is not set
  # CONFIG_I2C_VOODOO3 is not set
  # CONFIG_I2C_VIA is not set
  # CONFIG_I2C_VIAPRO is not set
  # CONFIG_I2C_VOODOO3 is not set


@@ -4541,7 +4541,7 @@
  CONFIG_I2C_MV64XXX=y
  
  #
  CONFIG_I2C_MV64XXX=y
  
  #

-@@ -847,19 +839,13 @@
+@@ -847,19 +839,13 @@ CONFIG_I2C_MV64XXX=y

  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCF8591 is not set


@@ -4561,7 +4561,7 @@
  # CONFIG_W1 is not set
  # CONFIG_POWER_SUPPLY is not set
  CONFIG_HWMON=y
  # CONFIG_W1 is not set
  # CONFIG_POWER_SUPPLY is not set
  CONFIG_HWMON=y

-@@ -872,6 +858,7 @@
+@@ -872,6 +858,7 @@ CONFIG_HWMON=y

  # CONFIG_SENSORS_ADM1031 is not set
  # CONFIG_SENSORS_ADM9240 is not set
  # CONFIG_SENSORS_ADT7470 is not set
  # CONFIG_SENSORS_ADM1031 is not set
  # CONFIG_SENSORS_ADM9240 is not set
  # CONFIG_SENSORS_ADT7470 is not set


@@ -4569,7 +4569,7 @@
  # CONFIG_SENSORS_ATXP1 is not set
  # CONFIG_SENSORS_DS1621 is not set
  # CONFIG_SENSORS_I5K_AMB is not set
  # CONFIG_SENSORS_ATXP1 is not set
  # CONFIG_SENSORS_DS1621 is not set
  # CONFIG_SENSORS_I5K_AMB is not set

-@@ -901,6 +888,7 @@
+@@ -901,6 +888,7 @@ CONFIG_HWMON=y

  # CONFIG_SENSORS_SMSC47M1 is not set
  # CONFIG_SENSORS_SMSC47M192 is not set
  # CONFIG_SENSORS_SMSC47B397 is not set
  # CONFIG_SENSORS_SMSC47M1 is not set
  # CONFIG_SENSORS_SMSC47M192 is not set
  # CONFIG_SENSORS_SMSC47B397 is not set


@@ -4577,7 +4577,7 @@
  # CONFIG_SENSORS_THMC50 is not set
  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set
  # CONFIG_SENSORS_THMC50 is not set
  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set

-@@ -910,6 +898,7 @@
+@@ -910,6 +898,7 @@ CONFIG_HWMON=y

  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set
  # CONFIG_SENSORS_W83L785TS is not set
  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set
  # CONFIG_SENSORS_W83L785TS is not set


@@ -4585,7 +4585,7 @@
  # CONFIG_SENSORS_W83627HF is not set
  # CONFIG_SENSORS_W83627EHF is not set
  # CONFIG_HWMON_DEBUG_CHIP is not set
  # CONFIG_SENSORS_W83627HF is not set
  # CONFIG_SENSORS_W83627EHF is not set
  # CONFIG_HWMON_DEBUG_CHIP is not set

-@@ -925,14 +914,24 @@
+@@ -925,14 +914,24 @@ CONFIG_SSB_POSSIBLE=y

  # Multifunction device drivers
  #
  # CONFIG_MFD_SM501 is not set
  # Multifunction device drivers
  #
  # CONFIG_MFD_SM501 is not set


@@ -4612,7 +4612,7 @@
  
  #
  # Graphics support
  
  #
  # Graphics support

-@@ -949,12 +948,6 @@
+@@ -949,12 +948,6 @@ CONFIG_DAB=y

  # CONFIG_DISPLAY_SUPPORT is not set
  
  #
  # CONFIG_DISPLAY_SUPPORT is not set
  
  #


@@ -4625,7 +4625,7 @@
  # Sound
  #
  # CONFIG_SOUND is not set
  # Sound
  #
  # CONFIG_SOUND is not set

-@@ -985,14 +978,18 @@
+@@ -985,14 +978,18 @@ CONFIG_USB_DEVICEFS=y

  CONFIG_USB_DEVICE_CLASS=y
  # CONFIG_USB_DYNAMIC_MINORS is not set
  # CONFIG_USB_OTG is not set
  CONFIG_USB_DEVICE_CLASS=y
  # CONFIG_USB_DYNAMIC_MINORS is not set
  # CONFIG_USB_OTG is not set


@@ -4644,7 +4644,7 @@
  # CONFIG_USB_OHCI_HCD is not set
  # CONFIG_USB_UHCI_HCD is not set
  # CONFIG_USB_SL811_HCD is not set
  # CONFIG_USB_OHCI_HCD is not set
  # CONFIG_USB_UHCI_HCD is not set
  # CONFIG_USB_SL811_HCD is not set

-@@ -1003,6 +1000,7 @@
+@@ -1003,6 +1000,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y

  #
  # CONFIG_USB_ACM is not set
  CONFIG_USB_PRINTER=y
  #
  # CONFIG_USB_ACM is not set
  CONFIG_USB_PRINTER=y


@@ -4652,7 +4652,7 @@
  
  #
  # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
  
  #
  # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

-@@ -1022,7 +1020,9 @@
+@@ -1022,7 +1020,9 @@ CONFIG_USB_STORAGE_SDDR09=y

  CONFIG_USB_STORAGE_SDDR55=y
  CONFIG_USB_STORAGE_JUMPSHOT=y
  # CONFIG_USB_STORAGE_ALAUDA is not set
  CONFIG_USB_STORAGE_SDDR55=y
  CONFIG_USB_STORAGE_JUMPSHOT=y
  # CONFIG_USB_STORAGE_ALAUDA is not set


@@ -4662,7 +4662,7 @@
  # CONFIG_USB_LIBUSUAL is not set
  
  #
  # CONFIG_USB_LIBUSUAL is not set
  
  #

-@@ -1060,6 +1060,7 @@
+@@ -1060,6 +1060,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y

  # CONFIG_USB_TRANCEVIBRATOR is not set
  # CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set
  # CONFIG_USB_TRANCEVIBRATOR is not set
  # CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set


@@ -4670,7 +4670,7 @@
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  CONFIG_NEW_LEDS=y
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  CONFIG_NEW_LEDS=y

-@@ -1076,6 +1077,7 @@
+@@ -1076,6 +1077,7 @@ CONFIG_LEDS_CLASS=y

  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y


@@ -4678,7 +4678,7 @@
  CONFIG_RTC_LIB=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_HCTOSYS=y
  CONFIG_RTC_LIB=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_HCTOSYS=y

-@@ -1105,6 +1107,7 @@
+@@ -1105,6 +1107,7 @@ CONFIG_RTC_DRV_RS5C372=y

  # CONFIG_RTC_DRV_PCF8583 is not set
  CONFIG_RTC_DRV_M41T80=y
  # CONFIG_RTC_DRV_M41T80_WDT is not set
  # CONFIG_RTC_DRV_PCF8583 is not set
  CONFIG_RTC_DRV_M41T80=y
  # CONFIG_RTC_DRV_M41T80_WDT is not set


@@ -4686,7 +4686,7 @@
  
  #
  # SPI RTC drivers
  
  #
  # SPI RTC drivers

-@@ -1125,6 +1128,7 @@
+@@ -1125,6 +1128,7 @@ CONFIG_RTC_DRV_M41T80=y

  #
  # on-CPU RTC drivers
  #
  #
  # on-CPU RTC drivers
  #


@@ -4694,7 +4694,7 @@
  
  #
  # File systems
  
  #
  # File systems

-@@ -1140,14 +1144,11 @@
+@@ -1140,14 +1144,11 @@ CONFIG_JBD=y

  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
  # CONFIG_XFS_FS is not set
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
  # CONFIG_XFS_FS is not set


@@ -4710,7 +4710,7 @@
  # CONFIG_AUTOFS_FS is not set
  # CONFIG_AUTOFS4_FS is not set
  # CONFIG_FUSE_FS is not set
  # CONFIG_AUTOFS_FS is not set
  # CONFIG_AUTOFS4_FS is not set
  # CONFIG_FUSE_FS is not set

-@@ -1155,8 +1156,8 @@
+@@ -1155,8 +1156,8 @@ CONFIG_DNOTIFY=y

  #
  # CD-ROM/DVD Filesystems
  #
  #
  # CD-ROM/DVD Filesystems
  #


@@ -4721,7 +4721,7 @@
  # CONFIG_ZISOFS is not set
  CONFIG_UDF_FS=m
  CONFIG_UDF_NLS=y
  # CONFIG_ZISOFS is not set
  CONFIG_UDF_FS=m
  CONFIG_UDF_NLS=y

-@@ -1205,8 +1206,10 @@
+@@ -1205,8 +1206,10 @@ CONFIG_JFFS2_RTIME=y

  # CONFIG_JFFS2_RUBIN is not set
  CONFIG_CRAMFS=y
  # CONFIG_VXFS_FS is not set
  # CONFIG_JFFS2_RUBIN is not set
  CONFIG_CRAMFS=y
  # CONFIG_VXFS_FS is not set


@@ -4732,7 +4732,7 @@
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y

-@@ -1214,7 +1217,6 @@
+@@ -1214,7 +1217,6 @@ CONFIG_NFS_FS=y

  CONFIG_NFS_V3=y
  # CONFIG_NFS_V3_ACL is not set
  # CONFIG_NFS_V4 is not set
  CONFIG_NFS_V3=y
  # CONFIG_NFS_V3_ACL is not set
  # CONFIG_NFS_V4 is not set


@@ -4740,7 +4740,7 @@
  # CONFIG_NFSD is not set
  CONFIG_ROOT_NFS=y
  CONFIG_LOCKD=y
  # CONFIG_NFSD is not set
  CONFIG_ROOT_NFS=y
  CONFIG_LOCKD=y

-@@ -1241,14 +1243,13 @@
+@@ -1241,14 +1243,13 @@ CONFIG_PARTITION_ADVANCED=y

  # CONFIG_MAC_PARTITION is not set
  CONFIG_MSDOS_PARTITION=y
  CONFIG_BSD_DISKLABEL=y
  # CONFIG_MAC_PARTITION is not set
  CONFIG_MSDOS_PARTITION=y
  CONFIG_BSD_DISKLABEL=y


@@ -4760,7 +4760,7 @@
  # CONFIG_KARMA_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
  # CONFIG_SYSV68_PARTITION is not set
  # CONFIG_KARMA_PARTITION is not set
  # CONFIG_EFI_PARTITION is not set
  # CONFIG_SYSV68_PARTITION is not set

-@@ -1300,15 +1301,48 @@
+@@ -1300,15 +1301,48 @@ CONFIG_NLS_ISO8859_2=y

  # CONFIG_PRINTK_TIME is not set
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  # CONFIG_PRINTK_TIME is not set
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y


@@ -4811,7 +4811,7 @@
  
  #
  # Security options
  
  #
  # Security options

-@@ -1317,50 +1351,79 @@
+@@ -1317,50 +1351,79 @@ CONFIG_DEBUG_USER=y

  # CONFIG_SECURITY is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_CRYPTO=y
  # CONFIG_SECURITY is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
  CONFIG_CRYPTO=y


@@ -4918,7 +4918,7 @@
  # CONFIG_CRYPTO_LZO is not set
  CONFIG_CRYPTO_HW=y
  # CONFIG_CRYPTO_DEV_HIFN_795X is not set
  # CONFIG_CRYPTO_LZO is not set
  CONFIG_CRYPTO_HW=y
  # CONFIG_CRYPTO_DEV_HIFN_795X is not set

-@@ -1369,12 +1432,14 @@
+@@ -1369,12 +1432,14 @@ CONFIG_CRYPTO_HW=y

  # Library routines
  #
  CONFIG_BITREVERSE=y
  # Library routines
  #
  CONFIG_BITREVERSE=y


@@ -4939,7 +4939,7 @@
  CONFIG_PLIST=y
 --- a/arch/arm/kernel/stacktrace.c
 +++ b/arch/arm/kernel/stacktrace.c
  CONFIG_PLIST=y
 --- a/arch/arm/kernel/stacktrace.c
 +++ b/arch/arm/kernel/stacktrace.c

-@@ -36,6 +36,7 @@
+@@ -36,6 +36,7 @@ EXPORT_SYMBOL(walk_stackframe);

  #ifdef CONFIG_STACKTRACE
  struct stack_trace_data {
        struct stack_trace *trace;
  #ifdef CONFIG_STACKTRACE
  struct stack_trace_data {
        struct stack_trace *trace;


@@ -4947,7 +4947,7 @@
        unsigned int skip;
  };
  
        unsigned int skip;
  };
  

-@@ -43,27 +44,52 @@
+@@ -43,27 +44,52 @@ static int save_trace(struct stackframe 

  {
        struct stack_trace_data *data = d;
        struct stack_trace *trace = data->trace;
  {
        struct stack_trace_data *data = d;
        struct stack_trace *trace = data->trace;


@@ -5056,7 +5056,7 @@
                .text
  
  /*
                .text
  
  /*

-@@ -55,11 +47,12 @@
+@@ -55,11 +47,12 @@ ENTRY(memmove)

                stmfd   sp!, {r5 - r8}
                blt     5f
  
                stmfd   sp!, {r5 - r8}
                blt     5f
  


@@ -5070,7 +5070,7 @@
        CALGN(  add     pc, r4, ip              )
  
        PLD(    pld     [r1, #-4]               )
        CALGN(  add     pc, r4, ip              )
  
        PLD(    pld     [r1, #-4]               )

-@@ -138,8 +131,7 @@
+@@ -138,8 +131,7 @@ ENTRY(memmove)

                subs    r2, r2, #28
                blt     14f
  
                subs    r2, r2, #28
                blt     14f
  


@@ -5082,7 +5082,7 @@
        CALGN(  bcc     15f                     )
 --- a/arch/arm/lib/memset.S
 +++ b/arch/arm/lib/memset.S
        CALGN(  bcc     15f                     )
 --- a/arch/arm/lib/memset.S
 +++ b/arch/arm/lib/memset.S

-@@ -39,6 +39,9 @@
+@@ -39,6 +39,9 @@ ENTRY(memset)

        mov     r3, r1
        cmp     r2, #16
        blt     4f
        mov     r3, r1
        cmp     r2, #16
        blt     4f


@@ -5092,7 +5092,7 @@
  /*
   * We need an extra register for this loop - save the return address and
   * use the LR
  /*
   * We need an extra register for this loop - save the return address and
   * use the LR

-@@ -64,6 +67,49 @@
+@@ -64,6 +67,49 @@ ENTRY(memset)

        stmneia r0!, {r1, r3, ip, lr}
        ldr     lr, [sp], #4
  
        stmneia r0!, {r1, r3, ip, lr}
        ldr     lr, [sp], #4
  


@@ -5144,7 +5144,7 @@
        tst     r2, #4
 --- a/arch/arm/lib/memzero.S
 +++ b/arch/arm/lib/memzero.S
        tst     r2, #4
 --- a/arch/arm/lib/memzero.S
 +++ b/arch/arm/lib/memzero.S

-@@ -39,6 +39,9 @@
+@@ -39,6 +39,9 @@ ENTRY(__memzero)

   */
        cmp     r1, #16                 @ 1 we can skip this chunk if we
        blt     4f                      @ 1 have < 16 bytes
   */
        cmp     r1, #16                 @ 1 we can skip this chunk if we
        blt     4f                      @ 1 have < 16 bytes


@@ -5154,7 +5154,7 @@
  /*
   * We need an extra register for this loop - save the return address and
   * use the LR
  /*
   * We need an extra register for this loop - save the return address and
   * use the LR

-@@ -64,6 +67,47 @@
+@@ -64,6 +67,47 @@ ENTRY(__memzero)

        stmneia r0!, {r2, r3, ip, lr}   @ 4
        ldr     lr, [sp], #4            @ 1
  
        stmneia r0!, {r2, r3, ip, lr}   @ 4
        ldr     lr, [sp], #4            @ 1
  


@@ -8286,7 +8286,7 @@
 +}
 --- a/arch/arm/mach-orion5x/Kconfig
 +++ b/arch/arm/mach-orion5x/Kconfig
 +}
 --- a/arch/arm/mach-orion5x/Kconfig
 +++ b/arch/arm/mach-orion5x/Kconfig

-@@ -44,6 +44,36 @@
+@@ -44,6 +44,36 @@ config MACH_LINKSTATION_PRO

          Buffalo Linkstation Pro/Live platform. Both v1 and
          v2 devices are supported.
  
          Buffalo Linkstation Pro/Live platform. Both v1 and
          v2 devices are supported.
  


@@ -8350,7 +8350,7 @@
  
  static int __init orion5x_cpu_win_can_remap(int win)
  {
  
  static int __init orion5x_cpu_win_can_remap(int win)
  {

-@@ -87,16 +88,22 @@
+@@ -87,16 +88,22 @@ static int __init orion5x_cpu_win_can_re

  static void __init setup_cpu_win(int win, u32 base, u32 size,
                                 u8 target, u8 attr, int remap)
  {
  static void __init setup_cpu_win(int win, u32 base, u32 size,
                                 u8 target, u8 attr, int remap)
  {


@@ -8378,7 +8378,7 @@
        }
  }
  
        }
  }
  

-@@ -109,11 +116,11 @@
+@@ -109,11 +116,11 @@ void __init orion5x_setup_cpu_mbus_bridg

         * First, disable and clear windows.
         */
        for (i = 0; i < 8; i++) {
         * First, disable and clear windows.
         */
        for (i = 0; i < 8; i++) {


@@ -8394,7 +8394,7 @@
                }
        }
  
                }
        }
  

-@@ -128,6 +135,7 @@
+@@ -128,6 +135,7 @@ void __init orion5x_setup_cpu_mbus_bridg

                TARGET_PCIE, ATTR_PCIE_MEM, -1);
        setup_cpu_win(3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE,
                TARGET_PCI, ATTR_PCI_MEM, -1);
                TARGET_PCIE, ATTR_PCIE_MEM, -1);
        setup_cpu_win(3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE,
                TARGET_PCI, ATTR_PCI_MEM, -1);


@@ -8402,7 +8402,7 @@
  
        /*
         * Setup MBUS dram target info.
  
        /*
         * Setup MBUS dram target info.

-@@ -147,8 +155,8 @@
+@@ -147,8 +155,8 @@ void __init orion5x_setup_cpu_mbus_bridg

                        w = &orion5x_mbus_dram_info.cs[cs++];
                        w->cs_index = i;
                        w->mbus_attr = 0xf & ~(1 << i);
                        w = &orion5x_mbus_dram_info.cs[cs++];
                        w->cs_index = i;
                        w->mbus_attr = 0xf & ~(1 << i);


@@ -8413,7 +8413,7 @@
                }
        }
        orion5x_mbus_dram_info.num_cs = cs;
                }
        }
        orion5x_mbus_dram_info.num_cs = cs;

-@@ -156,25 +164,30 @@
+@@ -156,25 +164,30 @@ void __init orion5x_setup_cpu_mbus_bridg

  
  void __init orion5x_setup_dev_boot_win(u32 base, u32 size)
  {
  
  void __init orion5x_setup_dev_boot_win(u32 base, u32 size)
  {


@@ -8451,7 +8451,7 @@
  }
 --- a/arch/arm/mach-orion5x/common.c
 +++ b/arch/arm/mach-orion5x/common.c
  }
 --- a/arch/arm/mach-orion5x/common.c
 +++ b/arch/arm/mach-orion5x/common.c

-@@ -39,25 +39,22 @@
+@@ -39,25 +39,22 @@ static struct map_desc orion5x_io_desc[]

                .virtual        = ORION5X_REGS_VIRT_BASE,
                .pfn            = __phys_to_pfn(ORION5X_REGS_PHYS_BASE),
                .length         = ORION5X_REGS_SIZE,
                .virtual        = ORION5X_REGS_VIRT_BASE,
                .pfn            = __phys_to_pfn(ORION5X_REGS_PHYS_BASE),
                .length         = ORION5X_REGS_SIZE,


@@ -8484,7 +8484,7 @@
        },
  };
  
        },
  };
  

-@@ -66,101 +63,32 @@
+@@ -66,101 +63,32 @@ void __init orion5x_map_io(void)

        iotable_init(orion5x_io_desc, ARRAY_SIZE(orion5x_io_desc));
  }
  
        iotable_init(orion5x_io_desc, ARRAY_SIZE(orion5x_io_desc));
  }
  


@@ -8595,7 +8595,7 @@
  static struct platform_device orion5x_ehci0 = {
        .name           = "orion-ehci",
        .id             = 0,
  static struct platform_device orion5x_ehci0 = {
        .name           = "orion-ehci",
        .id             = 0,

-@@ -173,6 +101,27 @@
+@@ -173,6 +101,27 @@ static struct platform_device orion5x_eh

        .num_resources  = ARRAY_SIZE(orion5x_ehci0_resources),
  };
  
        .num_resources  = ARRAY_SIZE(orion5x_ehci0_resources),
  };
  


@@ -8623,7 +8623,7 @@
  static struct platform_device orion5x_ehci1 = {
        .name           = "orion-ehci",
        .id             = 1,
  static struct platform_device orion5x_ehci1 = {
        .name           = "orion-ehci",
        .id             = 1,

-@@ -185,11 +134,15 @@
+@@ -185,11 +134,15 @@ static struct platform_device orion5x_eh

        .num_resources  = ARRAY_SIZE(orion5x_ehci1_resources),
  };
  
        .num_resources  = ARRAY_SIZE(orion5x_ehci1_resources),
  };
  


@@ -8642,7 +8642,7 @@
  struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = {
        .dram           = &orion5x_mbus_dram_info,
        .t_clk          = ORION5X_TCLK,
  struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = {
        .dram           = &orion5x_mbus_dram_info,
        .t_clk          = ORION5X_TCLK,

-@@ -219,7 +172,7 @@
+@@ -219,7 +172,7 @@ static struct resource orion5x_eth_resou

                .start  = IRQ_ORION5X_ETH_SUM,
                .end    = IRQ_ORION5X_ETH_SUM,
                .flags  = IORESOURCE_IRQ,
                .start  = IRQ_ORION5X_ETH_SUM,
                .end    = IRQ_ORION5X_ETH_SUM,
                .flags  = IORESOURCE_IRQ,


@@ -8651,7 +8651,7 @@
  };
  
  static struct platform_device orion5x_eth = {
  };
  
  static struct platform_device orion5x_eth = {

-@@ -238,11 +191,10 @@
+@@ -238,11 +191,10 @@ void __init orion5x_eth_init(struct mv64

        platform_device_register(&orion5x_eth);
  }
  
        platform_device_register(&orion5x_eth);
  }
  


@@ -8665,7 +8665,7 @@
  static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = {
        .freq_m         = 8, /* assumes 166 MHz TCLK */
        .freq_n         = 3,
  static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = {
        .freq_m         = 8, /* assumes 166 MHz TCLK */
        .freq_n         = 3,

-@@ -251,16 +203,15 @@
+@@ -251,16 +203,15 @@ static struct mv64xxx_i2c_pdata orion5x_

  
  static struct resource orion5x_i2c_resources[] = {
        {
  
  static struct resource orion5x_i2c_resources[] = {
        {


@@ -8691,7 +8691,7 @@
        },
  };
  
        },
  };
  

-@@ -270,36 +221,41 @@
+@@ -270,36 +221,41 @@ static struct platform_device orion5x_i2

        .num_resources  = ARRAY_SIZE(orion5x_i2c_resources),
        .resource       = orion5x_i2c_resources,
        .dev            = {
        .num_resources  = ARRAY_SIZE(orion5x_i2c_resources),
        .resource       = orion5x_i2c_resources,
        .dev            = {


@@ -8750,7 +8750,7 @@
  };
  
  void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)
  };
  
  void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)

-@@ -309,23 +265,111 @@
+@@ -309,23 +265,111 @@ void __init orion5x_sata_init(struct mv_

        platform_device_register(&orion5x_sata);
  }
  
        platform_device_register(&orion5x_sata);
  }
  


@@ -8865,7 +8865,7 @@
  /*
   * Identify device ID and rev from PCIe configuration header space '0'.
   */
  /*
   * Identify device ID and rev from PCIe configuration header space '0'.
   */

-@@ -350,8 +394,10 @@
+@@ -350,8 +394,10 @@ static void __init orion5x_id(u32 *dev, 

        } else if (*dev == MV88F5181_DEV_ID) {
                if (*rev == MV88F5181_REV_B1) {
                        *dev_name = "MV88F5181-Rev-B1";
        } else if (*dev == MV88F5181_DEV_ID) {
                if (*rev == MV88F5181_REV_B1) {
                        *dev_name = "MV88F5181-Rev-B1";


@@ -8877,7 +8877,7 @@
                }
        } else {
                *dev_name = "Device-Unknown";
                }
        } else {
                *dev_name = "Device-Unknown";

-@@ -370,15 +416,6 @@
+@@ -370,15 +416,6 @@ void __init orion5x_init(void)

         * Setup Orion address map
         */
        orion5x_setup_cpu_mbus_bridge();
         * Setup Orion address map
         */
        orion5x_setup_cpu_mbus_bridge();


@@ -8909,7 +8909,7 @@
  void orion5x_map_io(void);
  void orion5x_init_irq(void);
  void orion5x_init(void);
  void orion5x_map_io(void);
  void orion5x_init_irq(void);
  void orion5x_init(void);

-@@ -23,13 +25,19 @@
+@@ -23,13 +25,19 @@ void orion5x_setup_dev1_win(u32 base, u3

  void orion5x_setup_dev2_win(u32 base, u32 size);
  void orion5x_setup_pcie_wa_win(u32 base, u32 size);
  
  void orion5x_setup_dev2_win(u32 base, u32 size);
  void orion5x_setup_pcie_wa_win(u32 base, u32 size);
  


@@ -8933,7 +8933,7 @@
  
  void orion5x_pcie_id(u32 *dev, u32 *rev);
  int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
  
  void orion5x_pcie_id(u32 *dev, u32 *rev);
  int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);

-@@ -40,26 +48,9 @@
+@@ -40,26 +48,9 @@ int orion5x_pci_map_irq(struct pci_dev *

   * Valid GPIO pins according to MPP setup, used by machine-setup.
   * (/mach-orion/gpio.c).
   */
   * Valid GPIO pins according to MPP setup, used by machine-setup.
   * (/mach-orion/gpio.c).
   */


@@ -8971,7 +8971,7 @@
  
  /*****************************************************************************
   * DB-88F5281 on board devices
  
  /*****************************************************************************
   * DB-88F5281 on board devices

-@@ -86,7 +87,7 @@
+@@ -86,7 +87,7 @@ static struct platform_device db88f5281_

        .name           = "physmap-flash",
        .id             = 0,
        .dev            = {
        .name           = "physmap-flash",
        .id             = 0,
        .dev            = {


@@ -8980,7 +8980,7 @@
        },
        .num_resources  = 1,
        .resource       = &db88f5281_boot_flash_resource,
        },
        .num_resources  = 1,
        .resource       = &db88f5281_boot_flash_resource,

-@@ -110,7 +111,7 @@
+@@ -110,7 +111,7 @@ static struct platform_device db88f5281_

        .name           = "physmap-flash",
        .id             = 1,
        .dev            = {
        .name           = "physmap-flash",
        .id             = 1,
        .dev            = {


@@ -8989,7 +8989,7 @@
        },
        .num_resources  = 1,
        .resource       = &db88f5281_nor_flash_resource,
        },
        .num_resources  = 1,
        .resource       = &db88f5281_nor_flash_resource,

-@@ -125,18 +126,15 @@
+@@ -125,18 +126,15 @@ static struct mtd_partition db88f5281_na

                .name = "kernel",
                .offset = 0,
                .size = SZ_2M,
                .name = "kernel",
                .offset = 0,
                .size = SZ_2M,


@@ -9011,7 +9011,7 @@
                .name = "recovery",
                .offset = (SZ_16M + SZ_8M),
                .size = SZ_8M,
                .name = "recovery",
                .offset = (SZ_16M + SZ_8M),
                .size = SZ_8M,

-@@ -288,7 +286,6 @@
+@@ -288,7 +286,6 @@ subsys_initcall(db88f5281_pci_init);

   ****************************************************************************/
  static struct mv643xx_eth_platform_data db88f5281_eth_data = {
        .phy_addr       = 8,
   ****************************************************************************/
  static struct mv643xx_eth_platform_data db88f5281_eth_data = {
        .phy_addr       = 8,


@@ -9019,7 +9019,7 @@
  };
  
  /*****************************************************************************
  };
  
  /*****************************************************************************

-@@ -301,11 +298,28 @@
+@@ -301,11 +298,28 @@ static struct i2c_board_info __initdata 

  /*****************************************************************************
   * General Setup
   ****************************************************************************/
  /*****************************************************************************
   * General Setup
   ****************************************************************************/


@@ -9053,7 +9053,7 @@
  };
  
  static void __init db88f5281_init(void)
  };
  
  static void __init db88f5281_init(void)

-@@ -315,39 +329,31 @@
+@@ -315,39 +329,31 @@ static void __init db88f5281_init(void)

         */
        orion5x_init();
  
         */
        orion5x_init();
  


@@ -9119,7 +9119,7 @@
  
  #define DNS323_GPIO_LED_RIGHT_AMBER   1
  #define DNS323_GPIO_LED_LEFT_AMBER    2
  
  #define DNS323_GPIO_LED_RIGHT_AMBER   1
  #define DNS323_GPIO_LED_LEFT_AMBER    2

-@@ -52,8 +53,6 @@
+@@ -52,8 +53,6 @@ static int __init dns323_pci_map_irq(str

        if (irq != -1)
                return irq;
  
        if (irq != -1)
                return irq;
  


@@ -9128,7 +9128,7 @@
        return -1;
  }
  
        return -1;
  }
  

-@@ -81,7 +80,6 @@
+@@ -81,7 +80,6 @@ subsys_initcall(dns323_pci_init);

  
  static struct mv643xx_eth_platform_data dns323_eth_data = {
        .phy_addr = 8,
  
  static struct mv643xx_eth_platform_data dns323_eth_data = {
        .phy_addr = 8,


@@ -9136,7 +9136,7 @@
  };
  
  /****************************************************************************
  };
  
  /****************************************************************************

-@@ -119,7 +117,7 @@
+@@ -119,7 +117,7 @@ static struct mtd_partition dns323_parti

                .name   = "u-boot",
                .size   = 0x00030000,
                .offset = 0x007d0000,
                .name   = "u-boot",
                .size   = 0x00030000,
                .offset = 0x007d0000,


@@ -9145,7 +9145,7 @@
  };
  
  static struct physmap_flash_data dns323_nor_flash_data = {
  };
  
  static struct physmap_flash_data dns323_nor_flash_data = {

-@@ -137,7 +135,9 @@
+@@ -137,7 +135,9 @@ static struct resource dns323_nor_flash_

  static struct platform_device dns323_nor_flash = {
        .name           = "physmap-flash",
        .id             = 0,
  static struct platform_device dns323_nor_flash = {
        .name           = "physmap-flash",
        .id             = 0,


@@ -9156,7 +9156,7 @@
        .resource       = &dns323_nor_flash_resource,
        .num_resources  = 1,
  };
        .resource       = &dns323_nor_flash_resource,
        .num_resources  = 1,
  };

-@@ -170,7 +170,9 @@
+@@ -170,7 +170,9 @@ static struct gpio_led_platform_data dns

  static struct platform_device dns323_gpio_leds = {
        .name           = "leds-gpio",
        .id             = -1,
  static struct platform_device dns323_gpio_leds = {
        .name           = "leds-gpio",
        .id             = -1,


@@ -9167,7 +9167,7 @@
  };
  
  /****************************************************************************
  };
  
  /****************************************************************************

-@@ -183,35 +185,53 @@
+@@ -183,35 +185,53 @@ static struct gpio_keys_button dns323_bu

                .gpio           = DNS323_GPIO_KEY_RESET,
                .desc           = "Reset Button",
                .active_low     = 1,
                .gpio           = DNS323_GPIO_KEY_RESET,
                .desc           = "Reset Button",
                .active_low     = 1,


@@ -9231,7 +9231,7 @@
  };
  
  /*
  };
  
  /*

-@@ -225,17 +245,15 @@
+@@ -225,17 +245,15 @@ static struct platform_device *dns323_pl

  static struct i2c_board_info __initdata dns323_i2c_devices[] = {
        {
                I2C_BOARD_INFO("g760a", 0x3e),
  static struct i2c_board_info __initdata dns323_i2c_devices[] = {
        {
                I2C_BOARD_INFO("g760a", 0x3e),


@@ -9252,7 +9252,7 @@
  };
  
  /* DNS-323 specific power off method */
  };
  
  /* DNS-323 specific power off method */

-@@ -250,62 +268,35 @@
+@@ -250,62 +268,35 @@ static void __init dns323_init(void)

        /* Setup basic Orion functions. Need to be called early. */
        orion5x_init();
  
        /* Setup basic Orion functions. Need to be called early. */
        orion5x_init();
  


@@ -9336,7 +9336,7 @@
  /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
 --- a/arch/arm/mach-orion5x/gpio.c
 +++ b/arch/arm/mach-orion5x/gpio.c
  /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
 --- a/arch/arm/mach-orion5x/gpio.c
 +++ b/arch/arm/mach-orion5x/gpio.c

-@@ -24,9 +24,12 @@
+@@ -24,9 +24,12 @@ static DEFINE_SPINLOCK(gpio_lock);

  static unsigned long gpio_valid[BITS_TO_LONGS(GPIO_MAX)];
  static const char *gpio_label[GPIO_MAX];  /* non null for allocated GPIOs */
  
  static unsigned long gpio_valid[BITS_TO_LONGS(GPIO_MAX)];
  static const char *gpio_label[GPIO_MAX];  /* non null for allocated GPIOs */
  


@@ -9351,7 +9351,7 @@
  }
  
  /*
  }
  
  /*

-@@ -93,10 +96,10 @@
+@@ -93,10 +96,10 @@ int gpio_get_value(unsigned pin)

  {
        int val, mask = 1 << pin;
  
  {
        int val, mask = 1 << pin;
  


@@ -9365,7 +9365,7 @@
  
        return val & mask;
  }
  
        return val & mask;
  }

-@@ -188,39 +191,39 @@
+@@ -188,39 +191,39 @@ void gpio_display(void)

                        printk("GPIO, free\n");
                } else {
                        printk("GPIO, used by %s, ", gpio_label[i]);
                        printk("GPIO, free\n");
                } else {
                        printk("GPIO, used by %s, ", gpio_label[i]);


@@ -9424,7 +9424,7 @@
  }
 --- a/arch/arm/mach-orion5x/irq.c
 +++ b/arch/arm/mach-orion5x/irq.c
  }
 --- a/arch/arm/mach-orion5x/irq.c
 +++ b/arch/arm/mach-orion5x/irq.c

-@@ -82,7 +82,7 @@
+@@ -82,7 +82,7 @@ static int orion5x_gpio_set_irq_type(u32

        int pin = irq_to_gpio(irq);
        struct irq_desc *desc;
  
        int pin = irq_to_gpio(irq);
        struct irq_desc *desc;
  


@@ -9433,7 +9433,7 @@
                printk(KERN_ERR "orion5x_gpio_set_irq_type failed "
                                "(irq %d, pin %d).\n", irq, pin);
                return -EINVAL;
                printk(KERN_ERR "orion5x_gpio_set_irq_type failed "
                                "(irq %d, pin %d).\n", irq, pin);
                return -EINVAL;

-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ static int orion5x_gpio_set_irq_type(u32

                /*
                 * set initial polarity based on current input level
                 */
                /*
                 * set initial polarity based on current input level
                 */


@@ -9442,7 +9442,7 @@
                    & (1 << pin))
                        orion5x_setbits(GPIO_IN_POL, (1 << pin)); /* falling */
                else
                    & (1 << pin))
                        orion5x_setbits(GPIO_IN_POL, (1 << pin)); /* falling */
                else

-@@ -149,8 +149,8 @@
+@@ -149,8 +149,8 @@ static void orion5x_gpio_irq_handler(uns

  
        BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31);
        offs = (irq - IRQ_ORION5X_GPIO_0_7) * 8;
  
        BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31);
        offs = (irq - IRQ_ORION5X_GPIO_0_7) * 8;


@@ -9453,7 +9453,7 @@
  
        for (pin = offs; pin < offs + 8; pin++) {
                if (cause & (1 << pin)) {
  
        for (pin = offs; pin < offs + 8; pin++) {
                if (cause & (1 << pin)) {

-@@ -158,9 +158,9 @@
+@@ -158,9 +158,9 @@ static void orion5x_gpio_irq_handler(uns

                        desc = irq_desc + irq;
                        if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) {
                                /* Swap polarity (race with GPIO line) */
                        desc = irq_desc + irq;
                        if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) {
                                /* Swap polarity (race with GPIO line) */


@@ -9465,7 +9465,7 @@
                        }
                        desc_handle_irq(irq, desc);
                }
                        }
                        desc_handle_irq(irq, desc);
                }

-@@ -175,9 +175,9 @@
+@@ -175,9 +175,9 @@ static void __init orion5x_init_gpio_irq

        /*
         * Mask and clear GPIO IRQ interrupts
         */
        /*
         * Mask and clear GPIO IRQ interrupts
         */


@@ -9501,7 +9501,7 @@
  
  /*****************************************************************************
   * KUROBOX-PRO Info
  
  /*****************************************************************************
   * KUROBOX-PRO Info

-@@ -53,13 +56,11 @@
+@@ -53,13 +56,11 @@ static struct mtd_partition kurobox_pro_

                .name   = "uImage",
                .offset = 0,
                .size   = SZ_4M,
                .name   = "uImage",
                .offset = 0,
                .size   = SZ_4M,


@@ -9517,7 +9517,7 @@
                .name   = "extra",
                .offset = SZ_4M + SZ_64M,
                .size   = SZ_256M - (SZ_4M + SZ_64M),
                .name   = "extra",
                .offset = SZ_4M + SZ_64M,
                .size   = SZ_256M - (SZ_4M + SZ_64M),

-@@ -132,8 +133,6 @@
+@@ -132,8 +133,6 @@ static int __init kurobox_pro_pci_map_ir

        /*
         * PCI isn't used on the Kuro
         */
        /*
         * PCI isn't used on the Kuro
         */


@@ -9526,7 +9526,7 @@
        return -1;
  }
  
        return -1;
  }
  

-@@ -161,7 +160,6 @@
+@@ -161,7 +160,6 @@ subsys_initcall(kurobox_pro_pci_init);

  
  static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
        .phy_addr       = 8,
  
  static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
        .phy_addr       = 8,


@@ -9534,7 +9534,7 @@
  };
  
  /*****************************************************************************
  };
  
  /*****************************************************************************

-@@ -175,12 +173,169 @@
+@@ -175,12 +173,169 @@ static struct i2c_board_info __initdata 

   * SATA
   ****************************************************************************/
  static struct mv_sata_platform_data kurobox_pro_sata_data = {
   * SATA
   ****************************************************************************/
  static struct mv_sata_platform_data kurobox_pro_sata_data = {


@@ -9705,7 +9705,7 @@
  
  static void __init kurobox_pro_init(void)
  {
  
  static void __init kurobox_pro_init(void)
  {

-@@ -189,46 +344,32 @@
+@@ -189,46 +344,32 @@ static void __init kurobox_pro_init(void

         */
        orion5x_init();
  
         */
        orion5x_init();
  


@@ -10486,7 +10486,7 @@
 +MACHINE_END
 --- a/arch/arm/mach-orion5x/pci.c
 +++ b/arch/arm/mach-orion5x/pci.c
 +MACHINE_END
 --- a/arch/arm/mach-orion5x/pci.c
 +++ b/arch/arm/mach-orion5x/pci.c

-@@ -152,6 +152,8 @@
+@@ -152,6 +152,8 @@ static int __init pcie_setup(struct pci_

        if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
                printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config "
                                   "read transaction workaround\n");
        if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
                printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config "
                                   "read transaction workaround\n");


@@ -10495,7 +10495,7 @@
                pcie_ops.read = pcie_rd_conf_wa;
        }
  
                pcie_ops.read = pcie_rd_conf_wa;
        }
  

-@@ -240,13 +242,13 @@
+@@ -240,13 +242,13 @@ static int __init pcie_setup(struct pci_

   * PCI Address Decode Windows registers
   */
  #define PCI_BAR_SIZE_DDR_CS(n)        (((n) == 0) ? ORION5X_PCI_REG(0xc08) : \
   * PCI Address Decode Windows registers
   */
  #define PCI_BAR_SIZE_DDR_CS(n)        (((n) == 0) ? ORION5X_PCI_REG(0xc08) : \


@@ -10516,7 +10516,7 @@
  #define PCI_BAR_ENABLE                ORION5X_PCI_REG(0xc3c)
  #define PCI_ADDR_DECODE_CTRL  ORION5X_PCI_REG(0xd3c)
  
  #define PCI_BAR_ENABLE                ORION5X_PCI_REG(0xc3c)
  #define PCI_ADDR_DECODE_CTRL  ORION5X_PCI_REG(0xd3c)
  

-@@ -266,7 +268,7 @@
+@@ -266,7 +268,7 @@ static DEFINE_SPINLOCK(orion5x_pci_lock)

  
  static int orion5x_pci_local_bus_nr(void)
  {
  
  static int orion5x_pci_local_bus_nr(void)
  {


@@ -10525,7 +10525,7 @@
        return((conf & PCI_P2P_BUS_MASK) >> PCI_P2P_BUS_OFFS);
  }
  
        return((conf & PCI_P2P_BUS_MASK) >> PCI_P2P_BUS_OFFS);
  }
  

-@@ -276,11 +278,11 @@
+@@ -276,11 +278,11 @@ static int orion5x_pci_hw_rd_conf(int bu

        unsigned long flags;
        spin_lock_irqsave(&orion5x_pci_lock, flags);
  
        unsigned long flags;
        spin_lock_irqsave(&orion5x_pci_lock, flags);
  


@@ -10541,7 +10541,7 @@
  
        if (size == 1)
                *val = (*val >> (8*(where & 0x3))) & 0xff;
  
        if (size == 1)
                *val = (*val >> (8*(where & 0x3))) & 0xff;

-@@ -300,9 +302,9 @@
+@@ -300,9 +302,9 @@ static int orion5x_pci_hw_wr_conf(int bu

  
        spin_lock_irqsave(&orion5x_pci_lock, flags);
  
  
        spin_lock_irqsave(&orion5x_pci_lock, flags);
  


@@ -10554,7 +10554,7 @@
  
        if (size == 4) {
                __raw_writel(val, PCI_CONF_DATA);
  
        if (size == 4) {
                __raw_writel(val, PCI_CONF_DATA);

-@@ -353,9 +355,9 @@
+@@ -353,9 +355,9 @@ static struct pci_ops pci_ops = {

  
  static void __init orion5x_pci_set_bus_nr(int nr)
  {
  
  static void __init orion5x_pci_set_bus_nr(int nr)
  {


@@ -10566,7 +10566,7 @@
                /*
                 * PCI-X mode
                 */
                /*
                 * PCI-X mode
                 */

-@@ -372,7 +374,7 @@
+@@ -372,7 +374,7 @@ static void __init orion5x_pci_set_bus_n

                 */
                p2p &= ~PCI_P2P_BUS_MASK;
                p2p |= (nr << PCI_P2P_BUS_OFFS);
                 */
                p2p &= ~PCI_P2P_BUS_MASK;
                p2p |= (nr << PCI_P2P_BUS_OFFS);


@@ -10575,7 +10575,7 @@
        }
  }
  
        }
  }
  

-@@ -399,7 +401,7 @@
+@@ -399,7 +401,7 @@ static void __init orion5x_setup_pci_win

         * First, disable windows.
         */
        win_enable = 0xffffffff;
         * First, disable windows.
         */
        win_enable = 0xffffffff;


@@ -10584,7 +10584,7 @@
  
        /*
         * Setup windows for DDR banks.
  
        /*
         * Setup windows for DDR banks.

-@@ -425,10 +427,10 @@
+@@ -425,10 +427,10 @@ static void __init orion5x_setup_pci_win

                 */
                reg = PCI_CONF_REG_BAR_HI_CS(cs->cs_index);
                orion5x_pci_hw_wr_conf(bus, 0, func, reg, 4, 0);
                 */
                reg = PCI_CONF_REG_BAR_HI_CS(cs->cs_index);
                orion5x_pci_hw_wr_conf(bus, 0, func, reg, 4, 0);


@@ -10599,7 +10599,7 @@
  
                /*
                 * Enable decode window for this chip select.
  
                /*
                 * Enable decode window for this chip select.

-@@ -439,7 +441,7 @@
+@@ -439,7 +441,7 @@ static void __init orion5x_setup_pci_win

        /*
         * Re-enable decode windows.
         */
        /*
         * Re-enable decode windows.
         */


@@ -10618,7 +10618,7 @@
  
  /*****************************************************************************
   * RD-88F5182 Info
  
  /*****************************************************************************
   * RD-88F5182 Info

-@@ -125,6 +126,7 @@
+@@ -125,6 +126,7 @@ static int __init rd88f5182_dbgled_init(

  
                leds_event = rd88f5182_dbgled_event;
        }
  
                leds_event = rd88f5182_dbgled_event;
        }


@@ -10626,7 +10626,7 @@
        return 0;
  }
  
        return 0;
  }
  

-@@ -220,7 +222,6 @@
+@@ -220,7 +222,6 @@ subsys_initcall(rd88f5182_pci_init);

  
  static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
        .phy_addr       = 8,
  
  static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
        .phy_addr       = 8,


@@ -10634,7 +10634,7 @@
  };
  
  /*****************************************************************************
  };
  
  /*****************************************************************************

-@@ -234,15 +235,34 @@
+@@ -234,15 +235,34 @@ static struct i2c_board_info __initdata 

   * Sata
   ****************************************************************************/
  static struct mv_sata_platform_data rd88f5182_sata_data = {
   * Sata
   ****************************************************************************/
  static struct mv_sata_platform_data rd88f5182_sata_data = {


@@ -10673,7 +10673,7 @@
  };
  
  static void __init rd88f5182_init(void)
  };
  
  static void __init rd88f5182_init(void)

-@@ -252,35 +272,9 @@
+@@ -252,35 +272,9 @@ static void __init rd88f5182_init(void)

         */
        orion5x_init();
  
         */
        orion5x_init();
  


@@ -10710,7 +10710,7 @@
         * MPP[20] PCI Clock to MV88F5182
         * MPP[21] PCI Clock to mini PCI CON11
         * MPP[22] USB 0 over current indication
         * MPP[20] PCI Clock to MV88F5182
         * MPP[21] PCI Clock to mini PCI CON11
         * MPP[22] USB 0 over current indication

-@@ -289,16 +283,23 @@
+@@ -289,16 +283,23 @@ static void __init rd88f5182_init(void)

         * MPP[25] USB 0 over current enable
         */
  
         * MPP[25] USB 0 over current enable
         */
  


@@ -10839,7 +10839,7 @@
  };
  
  /*****************************************************************************
  };
  
  /*****************************************************************************

-@@ -164,12 +168,12 @@
+@@ -164,12 +168,12 @@ static int __init qnap_ts209_pci_map_irq

  }
  
  static struct hw_pci qnap_ts209_pci __initdata = {
  }
  
  static struct hw_pci qnap_ts209_pci __initdata = {


@@ -10858,7 +10858,7 @@
  };
  
  static int __init qnap_ts209_pci_init(void)
  };
  
  static int __init qnap_ts209_pci_init(void)

-@@ -183,96 +187,6 @@
+@@ -183,96 +187,6 @@ static int __init qnap_ts209_pci_init(vo

  subsys_initcall(qnap_ts209_pci_init);
  
  /*****************************************************************************
  subsys_initcall(qnap_ts209_pci_init);
  
  /*****************************************************************************


@@ -10955,7 +10955,7 @@
   * RTC S35390A on I2C bus
   ****************************************************************************/
  
   * RTC S35390A on I2C bus
   ****************************************************************************/
  

-@@ -280,7 +194,7 @@
+@@ -280,7 +194,7 @@ static void __init ts209_find_mac_addr(v

  
  static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = {
        I2C_BOARD_INFO("s35390a", 0x30),
  
  static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = {
        I2C_BOARD_INFO("s35390a", 0x30),


@@ -10964,7 +10964,7 @@
  };
  
  /****************************************************************************
  };
  
  /****************************************************************************

-@@ -297,70 +211,63 @@
+@@ -297,70 +211,63 @@ static struct gpio_keys_button qnap_ts20

                .gpio           = QNAP_TS209_GPIO_KEY_MEDIA,
                .desc           = "USB Copy Button",
                .active_low     = 1,
                .gpio           = QNAP_TS209_GPIO_KEY_MEDIA,
                .desc           = "USB Copy Button",
                .active_low     = 1,


@@ -11064,7 +11064,7 @@
  static void __init qnap_ts209_init(void)
  {
        /*
  static void __init qnap_ts209_init(void)
  {
        /*

-@@ -368,51 +275,33 @@
+@@ -368,51 +275,33 @@ static void __init qnap_ts209_init(void)

         */
        orion5x_init();
  
         */
        orion5x_init();
  


@@ -11134,7 +11134,7 @@
  
        /* Get RTC IRQ and register the chip */
        if (gpio_request(TS209_RTC_GPIO, "rtc") == 0) {
  
        /* Get RTC IRQ and register the chip */
        if (gpio_request(TS209_RTC_GPIO, "rtc") == 0) {

-@@ -425,14 +314,12 @@
+@@ -425,14 +314,12 @@ static void __init qnap_ts209_init(void)

                pr_warning("qnap_ts209_init: failed to get RTC IRQ\n");
        i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);
  
                pr_warning("qnap_ts209_init: failed to get RTC IRQ\n");
        i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);
  


@@ -12044,7 +12044,7 @@
 +MACHINE_END
 --- a/arch/arm/mm/Kconfig
 +++ b/arch/arm/mm/Kconfig
 +MACHINE_END
 --- a/arch/arm/mm/Kconfig
 +++ b/arch/arm/mm/Kconfig

-@@ -365,7 +365,7 @@
+@@ -365,7 +365,7 @@ config CPU_XSC3

  # Feroceon
  config CPU_FEROCEON
        bool
  # Feroceon
  config CPU_FEROCEON
        bool


@@ -12053,7 +12053,7 @@
        default y
        select CPU_32v5
        select CPU_ABRT_EV5T
        default y
        select CPU_32v5
        select CPU_ABRT_EV5T

-@@ -373,7 +373,7 @@
+@@ -373,7 +373,7 @@ config CPU_FEROCEON

        select CPU_CACHE_VIVT
        select CPU_CP15_MMU
        select CPU_COPY_FEROCEON if MMU
        select CPU_CACHE_VIVT
        select CPU_CP15_MMU
        select CPU_COPY_FEROCEON if MMU


@@ -12062,7 +12062,7 @@
  
  config CPU_FEROCEON_OLD_ID
        bool "Accept early Feroceon cores with an ARM926 ID"
  
  config CPU_FEROCEON_OLD_ID
        bool "Accept early Feroceon cores with an ARM926 ID"

-@@ -551,6 +551,11 @@
+@@ -551,6 +551,11 @@ config CPU_TLB_V4WBI

          ARM Architecture Version 4 TLB with writeback cache and invalidate
          instruction cache entry.
  
          ARM Architecture Version 4 TLB with writeback cache and invalidate
          instruction cache entry.
  


@@ -12074,7 +12074,7 @@
  config CPU_TLB_V6
        bool
  
  config CPU_TLB_V6
        bool
  

-@@ -709,6 +714,14 @@
+@@ -709,6 +714,14 @@ config OUTER_CACHE

        bool
        default n
  
        bool
        default n
  


@@ -12091,7 +12091,7 @@
        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
 --- a/arch/arm/mm/Makefile
 +++ b/arch/arm/mm/Makefile
        depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
 --- a/arch/arm/mm/Makefile
 +++ b/arch/arm/mm/Makefile

-@@ -46,6 +46,7 @@
+@@ -46,6 +46,7 @@ obj-$(CONFIG_CPU_TLB_V3)     += tlb-v3.o

  obj-$(CONFIG_CPU_TLB_V4WT)    += tlb-v4.o
  obj-$(CONFIG_CPU_TLB_V4WB)    += tlb-v4wb.o
  obj-$(CONFIG_CPU_TLB_V4WBI)   += tlb-v4wbi.o
  obj-$(CONFIG_CPU_TLB_V4WT)    += tlb-v4.o
  obj-$(CONFIG_CPU_TLB_V4WB)    += tlb-v4wb.o
  obj-$(CONFIG_CPU_TLB_V4WBI)   += tlb-v4wbi.o


@@ -12099,7 +12099,7 @@
  obj-$(CONFIG_CPU_TLB_V6)      += tlb-v6.o
  obj-$(CONFIG_CPU_TLB_V7)      += tlb-v7.o
  
  obj-$(CONFIG_CPU_TLB_V6)      += tlb-v6.o
  obj-$(CONFIG_CPU_TLB_V7)      += tlb-v7.o
  

-@@ -73,4 +74,5 @@
+@@ -73,4 +74,5 @@ obj-$(CONFIG_CPU_FEROCEON)   += proc-feroc

  obj-$(CONFIG_CPU_V6)          += proc-v6.o
  obj-$(CONFIG_CPU_V7)          += proc-v7.o
  
  obj-$(CONFIG_CPU_V6)          += proc-v6.o
  obj-$(CONFIG_CPU_V7)          += proc-v7.o
  


@@ -12460,7 +12460,7 @@
        mov     pc, lr
  
  /*
        mov     pc, lr
  
  /*

-@@ -59,6 +79,13 @@
+@@ -59,6 +79,13 @@ ENTRY(cpu_feroceon_proc_fin)

        mov     ip, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
        msr     cpsr_c, ip
        bl      feroceon_flush_kern_cache_all
        mov     ip, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
        msr     cpsr_c, ip
        bl      feroceon_flush_kern_cache_all


@@ -12474,7 +12474,7 @@
        mrc     p15, 0, r0, c1, c0, 0           @ ctrl register
        bic     r0, r0, #0x1000                 @ ...i............
        bic     r0, r0, #0x000e                 @ ............wca.
        mrc     p15, 0, r0, c1, c0, 0           @ ctrl register
        bic     r0, r0, #0x1000                 @ ...i............
        bic     r0, r0, #0x000e                 @ ............wca.

-@@ -117,11 +144,19 @@
+@@ -117,11 +144,19 @@ ENTRY(feroceon_flush_user_cache_all)

   */
  ENTRY(feroceon_flush_kern_cache_all)
        mov     r2, #VM_EXEC
   */
  ENTRY(feroceon_flush_kern_cache_all)
        mov     r2, #VM_EXEC


@@ -12497,7 +12497,7 @@
        mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
        mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
        mov     pc, lr
        mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
        mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
        mov     pc, lr

-@@ -138,7 +173,6 @@
+@@ -138,7 +173,6 @@ __flush_whole_cache:

   */
        .align  5
  ENTRY(feroceon_flush_user_cache_range)
   */
        .align  5
  ENTRY(feroceon_flush_user_cache_range)


@@ -12505,7 +12505,7 @@
        sub     r3, r1, r0                      @ calculate total size
        cmp     r3, #CACHE_DLIMIT
        bgt     __flush_whole_cache
        sub     r3, r1, r0                      @ calculate total size
        cmp     r3, #CACHE_DLIMIT
        bgt     __flush_whole_cache

-@@ -152,6 +186,7 @@
+@@ -152,6 +186,7 @@ ENTRY(feroceon_flush_user_cache_range)

        cmp     r0, r1
        blo     1b
        tst     r2, #VM_EXEC
        cmp     r0, r1
        blo     1b
        tst     r2, #VM_EXEC


@@ -12513,7 +12513,7 @@
        mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
        mov     pc, lr
  
        mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
        mov     pc, lr
  

-@@ -209,6 +244,20 @@
+@@ -209,6 +244,20 @@ ENTRY(feroceon_flush_kern_dcache_page)

        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  


@@ -12534,7 +12534,7 @@
  /*
   *    dma_inv_range(start, end)
   *
  /*
   *    dma_inv_range(start, end)
   *

-@@ -225,10 +274,10 @@
+@@ -225,10 +274,10 @@ ENTRY(feroceon_flush_kern_dcache_page)

        .align  5
  ENTRY(feroceon_dma_inv_range)
        tst     r0, #CACHE_DLINESIZE - 1
        .align  5
  ENTRY(feroceon_dma_inv_range)
        tst     r0, #CACHE_DLINESIZE - 1


@@ -12546,7 +12546,7 @@
  1:    mcr     p15, 0, r0, c7, c6, 1           @ invalidate D entry
        add     r0, r0, #CACHE_DLINESIZE
        cmp     r0, r1
  1:    mcr     p15, 0, r0, c7, c6, 1           @ invalidate D entry
        add     r0, r0, #CACHE_DLINESIZE
        cmp     r0, r1

-@@ -236,6 +285,22 @@
+@@ -236,6 +285,22 @@ ENTRY(feroceon_dma_inv_range)

        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  


@@ -12569,7 +12569,7 @@
  /*
   *    dma_clean_range(start, end)
   *
  /*
   *    dma_clean_range(start, end)
   *

-@@ -256,6 +321,19 @@
+@@ -256,6 +321,19 @@ ENTRY(feroceon_dma_clean_range)

        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  


@@ -12589,7 +12589,7 @@
  /*
   *    dma_flush_range(start, end)
   *
  /*
   *    dma_flush_range(start, end)
   *

-@@ -274,6 +352,19 @@
+@@ -274,6 +352,19 @@ ENTRY(feroceon_dma_flush_range)

        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  


@@ -12609,7 +12609,7 @@
  ENTRY(feroceon_cache_fns)
        .long   feroceon_flush_kern_cache_all
        .long   feroceon_flush_user_cache_all
  ENTRY(feroceon_cache_fns)
        .long   feroceon_flush_kern_cache_all
        .long   feroceon_flush_user_cache_all

-@@ -285,12 +376,33 @@
+@@ -285,12 +376,33 @@ ENTRY(feroceon_cache_fns)

        .long   feroceon_dma_clean_range
        .long   feroceon_dma_flush_range
  
        .long   feroceon_dma_clean_range
        .long   feroceon_dma_flush_range
  


@@ -12643,7 +12643,7 @@
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
        mov     pc, lr
  

-@@ -306,16 +418,25 @@
+@@ -306,16 +418,25 @@ ENTRY(cpu_feroceon_dcache_clean_area)

        .align  5
  ENTRY(cpu_feroceon_switch_mm)
  #ifdef CONFIG_MMU
        .align  5
  ENTRY(cpu_feroceon_switch_mm)
  #ifdef CONFIG_MMU


@@ -12676,7 +12676,7 @@
  
  /*
   * cpu_feroceon_set_pte_ext(ptep, pte, ext)
  
  /*
   * cpu_feroceon_set_pte_ext(ptep, pte, ext)

-@@ -345,6 +466,9 @@
+@@ -345,6 +466,9 @@ ENTRY(cpu_feroceon_set_pte_ext)

        str     r2, [r0]                        @ hardware version
        mov     r0, r0
        mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
        str     r2, [r0]                        @ hardware version
        mov     r0, r0
        mcr     p15, 0, r0, c7, c10, 1          @ clean D entry


@@ -12686,7 +12686,7 @@
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
  #endif
        mov     pc, lr
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
  #endif
        mov     pc, lr

-@@ -414,6 +538,21 @@
+@@ -414,6 +538,21 @@ cpu_feroceon_name:

        .asciz  "Feroceon"
        .size   cpu_feroceon_name, . - cpu_feroceon_name
  
        .asciz  "Feroceon"
        .size   cpu_feroceon_name, . - cpu_feroceon_name
  


@@ -12708,7 +12708,7 @@
        .align
  
        .section ".proc.info.init", #alloc, #execinstr
        .align
  
        .section ".proc.info.init", #alloc, #execinstr

-@@ -421,15 +560,15 @@
+@@ -421,15 +560,15 @@ cpu_feroceon_name:

  #ifdef CONFIG_CPU_FEROCEON_OLD_ID
        .type   __feroceon_old_id_proc_info,#object
  __feroceon_old_id_proc_info:
  #ifdef CONFIG_CPU_FEROCEON_OLD_ID
        .type   __feroceon_old_id_proc_info,#object
  __feroceon_old_id_proc_info:


@@ -12728,7 +12728,7 @@
                PMD_BIT4 | \
                PMD_SECT_AP_WRITE | \
                PMD_SECT_AP_READ
                PMD_BIT4 | \
                PMD_SECT_AP_WRITE | \
                PMD_SECT_AP_READ

-@@ -445,17 +584,17 @@
+@@ -445,17 +584,17 @@ __feroceon_old_id_proc_info:

        .size   __feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info
  #endif
  
        .size   __feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info
  #endif
  


@@ -12750,7 +12750,7 @@
                PMD_BIT4 | \
                PMD_SECT_AP_WRITE | \
                PMD_SECT_AP_READ
                PMD_BIT4 | \
                PMD_SECT_AP_WRITE | \
                PMD_SECT_AP_READ

-@@ -463,9 +602,59 @@
+@@ -463,9 +602,59 @@ __feroceon_proc_info:

        .long   cpu_arch_name
        .long   cpu_elf_name
        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
        .long   cpu_arch_name
        .long   cpu_elf_name
        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP


@@ -12814,7 +12814,7 @@
 +      .size   __88fr131_proc_info, . - __88fr131_proc_info
 --- a/arch/arm/plat-orion/irq.c
 +++ b/arch/arm/plat-orion/irq.c
 +      .size   __88fr131_proc_info, . - __88fr131_proc_info
 --- a/arch/arm/plat-orion/irq.c
 +++ b/arch/arm/plat-orion/irq.c

-@@ -36,8 +36,8 @@
+@@ -36,8 +36,8 @@ static void orion_irq_unmask(u32 irq)

  
  static struct irq_chip orion_irq_chip = {
        .name           = "orion_irq",
  
  static struct irq_chip orion_irq_chip = {
        .name           = "orion_irq",


@@ -12824,7 +12824,7 @@
        .unmask         = orion_irq_unmask,
  };
  
        .unmask         = orion_irq_unmask,
  };
  

-@@ -59,6 +59,7 @@
+@@ -59,6 +59,7 @@ void __init orion_irq_init(unsigned int 

                set_irq_chip(irq, &orion_irq_chip);
                set_irq_chip_data(irq, maskaddr);
                set_irq_handler(irq, handle_level_irq);
                set_irq_chip(irq, &orion_irq_chip);
                set_irq_chip_data(irq, maskaddr);
                set_irq_handler(irq, handle_level_irq);


@@ -12842,7 +12842,7 @@
  #define PCIE_STAT_OFF         0x1a04
  #define  PCIE_STAT_DEV_OFFS           20
  #define  PCIE_STAT_DEV_MASK           0x1f
  #define PCIE_STAT_OFF         0x1a04
  #define  PCIE_STAT_DEV_OFFS           20
  #define  PCIE_STAT_DEV_MASK           0x1f

-@@ -62,6 +63,11 @@
+@@ -62,6 +63,11 @@ int orion_pcie_link_up(void __iomem *bas

        return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN);
  }
  
        return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN);
  }
  


@@ -12856,7 +12856,7 @@
        u32 stat = readl(base + PCIE_STAT_OFF);
 --- a/arch/arm/plat-orion/time.c
 +++ b/arch/arm/plat-orion/time.c
        u32 stat = readl(base + PCIE_STAT_OFF);
 --- a/arch/arm/plat-orion/time.c
 +++ b/arch/arm/plat-orion/time.c

-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ orion_clkevt_next_event(unsigned long de

        /*
         * Clear and enable clockevent timer interrupt.
         */
        /*
         * Clear and enable clockevent timer interrupt.
         */


@@ -12865,7 +12865,7 @@
  
        u = readl(BRIDGE_MASK);
        u |= BRIDGE_INT_TIMER1;
  
        u = readl(BRIDGE_MASK);
        u |= BRIDGE_INT_TIMER1;

-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ orion_clkevt_mode(enum clock_event_mode 

                /*
                 * ACK pending timer interrupt.
                 */
                /*
                 * ACK pending timer interrupt.
                 */


@@ -12874,7 +12874,7 @@
  
        }
        local_irq_restore(flags);
  
        }
        local_irq_restore(flags);

-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ static irqreturn_t orion_timer_interrupt

        /*
         * ACK timer interrupt and call event handler.
         */
        /*
         * ACK timer interrupt and call event handler.
         */


@@ -13373,7 +13373,7 @@
        u16 byte_cnt;           /* Descriptor buffer byte count         */
        u16 buf_size;           /* Buffer size                          */
        u32 cmd_sts;            /* Descriptor command status            */
        u16 byte_cnt;           /* Descriptor buffer byte count         */
        u16 buf_size;           /* Buffer size                          */
        u32 cmd_sts;            /* Descriptor command status            */

-@@ -441,7 +180,7 @@
+@@ -441,7 +180,7 @@ struct eth_rx_desc {

        u32 buf_ptr;            /* Descriptor buffer pointer            */
  };
  
        u32 buf_ptr;            /* Descriptor buffer pointer            */
  };
  


@@ -13382,7 +13382,7 @@
        u16 byte_cnt;           /* buffer byte count                    */
        u16 l4i_chk;            /* CPU provided TCP checksum            */
        u32 cmd_sts;            /* Command/status field                 */
        u16 byte_cnt;           /* buffer byte count                    */
        u16 l4i_chk;            /* CPU provided TCP checksum            */
        u32 cmd_sts;            /* Command/status field                 */

-@@ -449,7 +188,7 @@
+@@ -449,7 +188,7 @@ struct eth_tx_desc {

        u32 buf_ptr;            /* pointer to buffer for this descriptor*/
  };
  #elif defined(__LITTLE_ENDIAN)
        u32 buf_ptr;            /* pointer to buffer for this descriptor*/
  };
  #elif defined(__LITTLE_ENDIAN)


@@ -13391,7 +13391,7 @@
        u32 cmd_sts;            /* Descriptor command status            */
        u16 buf_size;           /* Buffer size                          */
        u16 byte_cnt;           /* Descriptor buffer byte count         */
        u32 cmd_sts;            /* Descriptor command status            */
        u16 buf_size;           /* Buffer size                          */
        u16 byte_cnt;           /* Descriptor buffer byte count         */

-@@ -457,7 +196,7 @@
+@@ -457,7 +196,7 @@ struct eth_rx_desc {

        u32 next_desc_ptr;      /* Next descriptor pointer              */
  };
  
        u32 next_desc_ptr;      /* Next descriptor pointer              */
  };
  


@@ -13400,7 +13400,7 @@
        u32 cmd_sts;            /* Command/status field                 */
        u16 l4i_chk;            /* CPU provided TCP checksum            */
        u16 byte_cnt;           /* buffer byte count                    */
        u32 cmd_sts;            /* Command/status field                 */
        u16 l4i_chk;            /* CPU provided TCP checksum            */
        u16 byte_cnt;           /* buffer byte count                    */

-@@ -468,18 +207,59 @@
+@@ -468,18 +207,59 @@ struct eth_tx_desc {

  #error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
  #endif
  
  #error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
  #endif
  


@@ -13470,7 +13470,7 @@
        u64 good_octets_received;
        u32 bad_octets_received;
        u32 internal_mac_transmit_err;
        u64 good_octets_received;
        u32 bad_octets_received;
        u32 internal_mac_transmit_err;

-@@ -512,461 +292,282 @@
+@@ -512,461 +292,282 @@ struct mv643xx_mib_counters {

        u32 late_collision;
  };
  
        u32 late_collision;
  };
  


@@ -14124,7 +14124,7 @@
                                stats->rx_errors++;
  
                        dev_kfree_skb_irq(skb);
                                stats->rx_errors++;
  
                        dev_kfree_skb_irq(skb);

-@@ -975,668 +576,120 @@
+@@ -975,668 +576,120 @@ static int mv643xx_eth_receive_queue(str

                         * The -4 is for the CRC in the trailer of the
                         * received packet
                         */
                         * The -4 is for the CRC in the trailer of the
                         * received packet
                         */


@@ -14869,7 +14869,7 @@
                desc->l4i_chk = 0;
                desc->byte_cnt = this_frag->size;
                desc->buf_ptr = dma_map_page(NULL, this_frag->page,
                desc->l4i_chk = 0;
                desc->byte_cnt = this_frag->size;
                desc->buf_ptr = dma_map_page(NULL, this_frag->page,

-@@ -1651,37 +704,28 @@
+@@ -1651,37 +704,28 @@ static inline __be16 sum16_as_be(__sum16

        return (__force __be16)sum;
  }
  
        return (__force __be16)sum;
  }
  


@@ -14917,7 +14917,7 @@
        }
  
        desc->byte_cnt = length;
        }
  
        desc->byte_cnt = length;

-@@ -1690,13 +734,13 @@
+@@ -1690,13 +734,13 @@ static void eth_tx_submit_descs_for_skb(

        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                BUG_ON(skb->protocol != htons(ETH_P_IP));
  
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                BUG_ON(skb->protocol != htons(ETH_P_IP));
  


@@ -14935,7 +14935,7 @@
                        desc->l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)->check));
                        break;
                case IPPROTO_TCP:
                        desc->l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)->check));
                        break;
                case IPPROTO_TCP:

-@@ -1707,7 +751,7 @@
+@@ -1707,7 +751,7 @@ static void eth_tx_submit_descs_for_skb(

                }
        } else {
                /* Errata BTS #50, IHL must be 5 if no HW checksum */
                }
        } else {
                /* Errata BTS #50, IHL must be 5 if no HW checksum */


@@ -14944,7 +14944,7 @@
                desc->l4i_chk = 0;
        }
  
                desc->l4i_chk = 0;
        }
  

-@@ -1717,1649 +761,1818 @@
+@@ -1717,1649 +761,1818 @@ static void eth_tx_submit_descs_for_skb(

  
        /* ensure all descriptors are written before poking hardware */
        wmb();
  
        /* ensure all descriptors are written before poking hardware */
        wmb();


@@ -19429,7 +19429,7 @@
  
  static inline void __iomem *
  __arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)
  
  static inline void __iomem *
  __arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)

-@@ -53,15 +52,12 @@
+@@ -53,15 +52,12 @@ static inline void __iomem *__io(unsigne

  /*****************************************************************************
   * Helpers to access Orion registers
   ****************************************************************************/
  /*****************************************************************************
   * Helpers to access Orion registers
   ****************************************************************************/


@@ -19632,7 +19632,7 @@
  #define v4wb_tlb_flags        (TLB_WB | TLB_DCLEAN | \
                         TLB_V4_I_FULL | TLB_V4_D_FULL | \
                         TLB_V4_D_PAGE)
  #define v4wb_tlb_flags        (TLB_WB | TLB_DCLEAN | \
                         TLB_V4_I_FULL | TLB_V4_D_FULL | \
                         TLB_V4_D_PAGE)

-@@ -245,12 +264,14 @@
+@@ -245,12 +264,14 @@ extern struct cpu_tlb_fns cpu_tlb;

  #define possible_tlb_flags    (v3_possible_flags | \
                                 v4_possible_flags | \
                                 v4wbi_possible_flags | \
  #define possible_tlb_flags    (v3_possible_flags | \
                                 v4_possible_flags | \
                                 v4wbi_possible_flags | \


@@ -19647,7 +19647,7 @@
                                 v4wb_always_flags & \
                                 v6wbi_always_flags)
  
                                 v4wb_always_flags & \
                                 v6wbi_always_flags)
  

-@@ -417,6 +438,11 @@
+@@ -417,6 +438,11 @@ static inline void flush_pmd_entry(pmd_t

        if (tlb_flag(TLB_DCLEAN))
                asm("mcr        p15, 0, %0, c7, c10, 1  @ flush_pmd"
                        : : "r" (pmd) : "cc");
        if (tlb_flag(TLB_DCLEAN))
                asm("mcr        p15, 0, %0, c7, c10, 1  @ flush_pmd"
                        : : "r" (pmd) : "cc");


@@ -19659,7 +19659,7 @@
        if (tlb_flag(TLB_WB))
                dsb();
  }
        if (tlb_flag(TLB_WB))
                dsb();
  }

-@@ -428,6 +454,10 @@
+@@ -428,6 +454,10 @@ static inline void clean_pmd_entry(pmd_t

        if (tlb_flag(TLB_DCLEAN))
                asm("mcr        p15, 0, %0, c7, c10, 1  @ flush_pmd"
                        : : "r" (pmd) : "cc");
        if (tlb_flag(TLB_DCLEAN))
                asm("mcr        p15, 0, %0, c7, c10, 1  @ flush_pmd"
                        : : "r" (pmd) : "cc");

diff --git a/target/linux/orion/patches/010-ignore_atag_cmdline.patch b/target/linux/orion/patches/010-ignore_atag_cmdline.patch
index 45975fe38f4e4f8853adc9b6af6bb0d90dc5e680..f93ad779d39ef91b3d2e071b3ec59979e3b8a2a4 100644 (file)
--- a/target/linux/orion/patches/010-ignore_atag_cmdline.patch
+++ b/target/linux/orion/patches/010-ignore_atag_cmdline.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c

-@@ -719,7 +719,7 @@
+@@ -719,7 +719,7 @@ __tagtable(ATAG_REVISION, parse_tag_revi

  
  static int __init parse_tag_cmdline(const struct tag *tag)
  {
  
  static int __init parse_tag_cmdline(const struct tag *tag)
  {

diff --git a/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch b/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
index 270d3e5f1228dff7ccec9ad522990a0c2d72f373..6268a05b51e8e640c0ea1f08cb3864ffdd72e3bd 100644 (file)
--- a/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
+++ b/target/linux/orion/patches/050-wrt350nv2_cfi_workaround.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c

-@@ -323,8 +323,9 @@
+@@ -323,8 +323,9 @@ struct mtd_info *cfi_cmdset_0002(struct 

                        return NULL;
                }
  
                        return NULL;
                }
  

diff --git a/target/linux/orion/patches/099-add_netgear_wnr854t_support.patch b/target/linux/orion/patches/099-add_netgear_wnr854t_support.patch
index 206002a7911113fcb82f6c3623ac15a50b12c9c0..cc272b2b88e181821d38a08888cf28c4988847fb 100644 (file)
--- a/target/linux/orion/patches/099-add_netgear_wnr854t_support.patch
+++ b/target/linux/orion/patches/099-add_netgear_wnr854t_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-orion5x/Kconfig
 +++ b/arch/arm/mach-orion5x/Kconfig
 --- a/arch/arm/mach-orion5x/Kconfig
 +++ b/arch/arm/mach-orion5x/Kconfig

-@@ -74,6 +74,12 @@
+@@ -74,6 +74,12 @@ config MACH_MSS2

          Say 'Y' here if you want your kernel to support the
          Maxtor Shared Storage II platform.
  
          Say 'Y' here if you want your kernel to support the
          Maxtor Shared Storage II platform.
  


@@ -15,7 +15,7 @@
  endif
 --- a/arch/arm/mach-orion5x/Makefile
 +++ b/arch/arm/mach-orion5x/Makefile
  endif
 --- a/arch/arm/mach-orion5x/Makefile
 +++ b/arch/arm/mach-orion5x/Makefile

-@@ -10,3 +10,4 @@
+@@ -10,3 +10,4 @@ obj-$(CONFIG_MACH_WRT350N_V2)        += wrt350n

  obj-$(CONFIG_MACH_TS78XX)     += ts78xx-setup.o
  obj-$(CONFIG_MACH_MV2120)     += mv2120-setup.o
  obj-$(CONFIG_MACH_MSS2)               += mss2-setup.o
  obj-$(CONFIG_MACH_TS78XX)     += ts78xx-setup.o
  obj-$(CONFIG_MACH_MV2120)     += mv2120-setup.o
  obj-$(CONFIG_MACH_MSS2)               += mss2-setup.o


@@ -189,7 +189,7 @@
 +MACHINE_END
 --- a/arch/arm/configs/orion5x_defconfig
 +++ b/arch/arm/configs/orion5x_defconfig
 +MACHINE_END
 --- a/arch/arm/configs/orion5x_defconfig
 +++ b/arch/arm/configs/orion5x_defconfig

-@@ -166,6 +166,7 @@
+@@ -166,6 +166,7 @@ CONFIG_MACH_KUROBOX_PRO=y

  CONFIG_MACH_DNS323=y
  CONFIG_MACH_TS209=y
  CONFIG_MACH_LINKSTATION_PRO=y
  CONFIG_MACH_DNS323=y
  CONFIG_MACH_TS209=y
  CONFIG_MACH_LINKSTATION_PRO=y

diff --git a/target/linux/orion/patches/100-openwrt_partition_map.patch b/target/linux/orion/patches/100-openwrt_partition_map.patch
index 082c0c1b758ef0f029c84c3fdd6bc2695d3d4664..d95e2ec8b64636cea0cd9bb1883170411ec0cf3f 100644 (file)
--- a/target/linux/orion/patches/100-openwrt_partition_map.patch
+++ b/target/linux/orion/patches/100-openwrt_partition_map.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
 +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
 +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c

-@@ -56,19 +56,11 @@
+@@ -56,19 +56,11 @@ static struct mtd_partition wrt350n_v2_n

        {
                .name           = "kernel",
                .offset         = 0x00000000,
        {
                .name           = "kernel",
                .offset         = 0x00000000,

diff --git a/target/linux/ppc40x/patches/002-disable_emac_loopback_mode.patch b/target/linux/ppc40x/patches/002-disable_emac_loopback_mode.patch
index 10f17747bc1a01e2175ddff212eee07fc4c212c1..18fefd872d0ff2d984e9191508ebc16170914fb7 100644 (file)
--- a/target/linux/ppc40x/patches/002-disable_emac_loopback_mode.patch
+++ b/target/linux/ppc40x/patches/002-disable_emac_loopback_mode.patch
@@ -9,7 +9,7 @@
  
  static __initdata struct of_device_id kilauea_of_bus[] = {
        { .compatible = "ibm,plb4", },
  
  static __initdata struct of_device_id kilauea_of_bus[] = {
        { .compatible = "ibm,plb4", },

-@@ -46,6 +48,13 @@
+@@ -46,6 +48,13 @@ static int __init kilauea_probe(void)

  
        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
  
  
        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
  

diff --git a/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch
index 200c684577a48e72935626c4dbc8299ff6141109..442c0ec76ed8f72828b7fec6e18a724bff464108 100644 (file)
--- a/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch
+++ b/target/linux/uml/patches/001-gcc4_unit_at_a_time_i386_fix.patch
@@ -1,6 +1,6 @@
 --- a/arch/um/Makefile-i386
 +++ b/arch/um/Makefile-i386
 --- a/arch/um/Makefile-i386
 +++ b/arch/um/Makefile-i386

-@@ -35,7 +35,7 @@
+@@ -35,7 +35,7 @@ cflags-y += -ffreestanding

  # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
  # a lot more stack due to the lack of sharing of stacklots.  Also, gcc
  # 4.3.0 needs -funit-at-a-time for extern inline functions.
  # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
  # a lot more stack due to the lack of sharing of stacklots.  Also, gcc
  # 4.3.0 needs -funit-at-a-time for extern inline functions.