move CONFIG_XFS_DEBUG to generic config

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

diff --git a/target/linux/adm5120/patches/001-adm5120.patch b/target/linux/adm5120/patches/001-adm5120.patch
index 1deda1a083bf27e38ba86976c743bd8ce9281518..290dbd684393624edf8d3ee66bd073bfed0ec35c 100644 (file)
--- a/target/linux/adm5120/patches/001-adm5120.patch
+++ b/target/linux/adm5120/patches/001-adm5120.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24/arch/mips/Kconfig
-===================================================================
---- linux-2.6.24.orig/arch/mips/Kconfig
-+++ linux-2.6.24/arch/mips/Kconfig
-@@ -16,6 +16,20 @@ choice
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -18,6 +18,21 @@
        prompt "System type"
        default SGI_IP22
  
@@ -19,23 +17,22 @@ Index: linux-2.6.24/arch/mips/Kconfig
 +      select SYS_SUPPORTS_BIG_ENDIAN
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select GENERIC_GPIO
++      select SWAP_IO_SPACE if CPU_BIG_ENDIAN
 +
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  
-@@ -689,6 +703,7 @@ config WR_PPMC
+@@ -683,6 +698,7 @@
  
  endchoice
  
 +source "arch/mips/adm5120/Kconfig"
  source "arch/mips/au1000/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
  source "arch/mips/jazz/Kconfig"
- source "arch/mips/lasat/Kconfig"
-Index: linux-2.6.24/arch/mips/Makefile
-===================================================================
---- linux-2.6.24.orig/arch/mips/Makefile
-+++ linux-2.6.24/arch/mips/Makefile
-@@ -166,6 +166,16 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -174,6 +174,16 @@
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
  
  #
@@ -52,13 +49,11 @@ Index: linux-2.6.24/arch/mips/Makefile
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
-Index: linux-2.6.24/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.24.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.24/include/asm-mips/bootinfo.h
-@@ -198,6 +198,58 @@
- #define MACH_GROUP_BRCM               23      /* Broadcom                     */
- #define  MACH_BCM47XX         1       /* Broadcom BCM47XX             */
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h
+@@ -94,6 +94,58 @@
+ #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
+ #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */
  
 +/*
 + * Valid machtype for group ADMtek ADM5120
@@ -114,4 +109,4 @@ Index: linux-2.6.24/include/asm-mips/bootinfo.h
 +
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
- const char *get_system_type(void);
+ extern char *system_type;