disable ipt_quota on linux 2.4 - iptables user space no longer compiles with it

[openwrt.git] / target / linux / adm5120-2.6 / patches / 001-adm5120.patch

diff --git a/target/linux/adm5120-2.6/patches/001-adm5120.patch b/target/linux/adm5120-2.6/patches/001-adm5120.patch
index da601b9..c1b2688 100644 (file)
--- a/target/linux/adm5120-2.6/patches/001-adm5120.patch
+++ b/target/linux/adm5120-2.6/patches/001-adm5120.patch
@@ -1,11 +1,11 @@
-Index: linux-2.6.22-rc6/arch/mips/Kconfig
+Index: linux-2.6.21.1/arch/mips/Kconfig
 ===================================================================
---- linux-2.6.22-rc6.orig/arch/mips/Kconfig
-+++ linux-2.6.22-rc6/arch/mips/Kconfig
-@@ -15,6 +15,17 @@ choice
+--- linux-2.6.21.1.orig/arch/mips/Kconfig
++++ linux-2.6.21.1/arch/mips/Kconfig
+@@ -16,6 +16,17 @@ choice
        prompt "System type"
        default SGI_IP22
- 
+
 +config MIPS_ADM5120
 +      bool "Support for ADM5120 SoC"
 +      select SYS_HAS_CPU_MIPS32_R1
@@ -17,24 +17,24 @@ Index: linux-2.6.22-rc6/arch/mips/Kconfig
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select GENERIC_GPIO
 +
- config MACH_ALCHEMY
-       bool "Alchemy processor based machines"
- 
-@@ -658,6 +669,7 @@ config TOSHIBA_RBTX4938
- 
+ config MIPS_MTX1
+       bool "4G Systems MTX-1 board"
+       select DMA_NONCOHERENT
+@@ -766,6 +775,7 @@
+
  endchoice
- 
+
 +source "arch/mips/adm5120/Kconfig"
- source "arch/mips/au1000/Kconfig"
  source "arch/mips/ddb5xxx/Kconfig"
  source "arch/mips/gt64120/ev64120/Kconfig"
-Index: linux-2.6.22-rc6/arch/mips/Makefile
+ source "arch/mips/jazz/Kconfig"
+Index: linux-2.6.21.1/arch/mips/Makefile
 ===================================================================
---- linux-2.6.22-rc6.orig/arch/mips/Makefile
-+++ linux-2.6.22-rc6/arch/mips/Makefile
+--- linux-2.6.21.1.orig/arch/mips/Makefile
++++ linux-2.6.21.1/arch/mips/Makefile
 @@ -165,6 +165,14 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
- 
+
  #
 +# ADMtek 5120
 +#
@@ -47,18 +47,18 @@ Index: linux-2.6.22-rc6/arch/mips/Makefile
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
-Index: linux-2.6.22-rc6/include/asm-mips/bootinfo.h
+Index: linux-2.6.21.1/include/asm-mips/bootinfo.h
 ===================================================================
---- linux-2.6.22-rc6.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.22-rc6/include/asm-mips/bootinfo.h
+--- linux-2.6.21.1.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.21.1/include/asm-mips/bootinfo.h
 @@ -213,6 +213,57 @@
  #define MACH_GROUP_NEC_EMMA2RH 25     /* NEC EMMA2RH (was 23)         */
  #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
- 
+
 +/*
 + * Valid machtype for group ADMtek ADM5120
 + */
-+#define MACH_GROUP_ADM5120    26
++#define MACH_GROUP_ADM5120    23
 +#define MACH_ADM5120_UNKNOWN  0       /* Unknown board */
 +#define MACH_ADM5120_WP54G_WRT        1       /* Compex WP54G-WRT */
 +#define MACH_ADM5120_WP54G    2       /* Compex WP54G */
@@ -107,5 +107,5 @@ Index: linux-2.6.22-rc6/include/asm-mips/bootinfo.h
 +#define MACH_ADM5120_BR6104K  47      /* Edimax BR-6104K */
 +
  #define CL_SIZE                       COMMAND_LINE_SIZE
- 
+
  const char *get_system_type(void);