[adm5120] resync 2.6.28 config

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

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 658a80e..95757d4 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
-@@ -18,6 +18,24 @@
+@@ -18,6 +18,23 @@ choice
        prompt "System type"
        default SGI_IP22
  
@@ -11,7 +11,6 @@
 +      select CEVT_R4K
 +      select CSRC_R4K
 +      select IRQ_CPU
-+      select NO_EXCEPT_FILL
 +      select SWAP_IO_SPACE
 +      select SYS_HAS_CPU_MIPS32_R1
 +      select SYS_HAS_EARLY_PRINTK
@@ -27,7 +26,7 @@
  
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c
-@@ -1112,9 +1112,22 @@
+@@ -1188,9 +1188,22 @@ void *set_except_vector(int n, void *add
  
        exception_handlers[n] = handler;
        if (n == 0 && cpu_has_divec) {
@@ -55,7 +54,7 @@
  }
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -167,6 +167,13 @@
+@@ -167,6 +167,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
  #
  
  #
@@ -71,7 +70,7 @@
  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)