[kernel] x86: Sync kernel config

[openwrt.git] / target / linux / ar7 / patches-2.6.25 / 100-board_support.patch

diff --git a/target/linux/ar7/patches-2.6.25/100-board_support.patch b/target/linux/ar7/patches-2.6.25/100-board_support.patch
index 08cf79b..658a80e 100644 (file)
--- a/target/linux/ar7/patches-2.6.25/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.25/100-board_support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.1/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.1.orig/arch/mips/Kconfig      2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/arch/mips/Kconfig   2008-05-03 16:17:54.000000000 +0200
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
 @@ -18,6 +18,24 @@
        prompt "System type"
        default SGI_IP22
@@ -27,10 +25,8 @@ Index: linux-2.6.25.1/arch/mips/Kconfig
  config MACH_ALCHEMY
        bool "Alchemy processor based machines"
  
-Index: linux-2.6.25.1/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.25.1.orig/arch/mips/kernel/traps.c       2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/arch/mips/kernel/traps.c    2008-05-03 16:17:54.000000000 +0200
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
 @@ -1112,9 +1112,22 @@
  
        exception_handlers[n] = handler;
@@ -57,10 +53,8 @@ Index: linux-2.6.25.1/arch/mips/kernel/traps.c
        }
        return (void *)old_handler;
  }
-Index: linux-2.6.25.1/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.1.orig/arch/mips/Makefile     2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/arch/mips/Makefile  2008-05-03 16:17:54.000000000 +0200
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
 @@ -167,6 +167,13 @@
  #
  
@@ -75,10 +69,8 @@ Index: linux-2.6.25.1/arch/mips/Makefile
  # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
  #
  core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
-Index: linux-2.6.25.1/include/asm-mips/page.h
-===================================================================
---- linux-2.6.25.1.orig/include/asm-mips/page.h        2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/include/asm-mips/page.h     2008-05-03 16:17:54.000000000 +0200
+--- a/include/asm-mips/page.h
++++ b/include/asm-mips/page.h
 @@ -182,8 +182,10 @@
  #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)