[kernel] resync kernel patches

[openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index 31a4e59..6506312 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -8,24 +8,30 @@ config LINUX_2_4
 config LINUX_2_6
        bool
 
-config PCI_SUPPORT
+config HAS_FPU
        bool
 
-config PCMCIA_SUPPORT
+config DISPLAY_SUPPORT
        bool
 
-config USB_SUPPORT
+config GPIO_SUPPORT
+       bool
+
+config PCI_SUPPORT
        bool
 
-config ATM_SUPPORT
+config PCMCIA_SUPPORT
        bool
 
-config VIDEO_SUPPORT
+config USB_SUPPORT
        bool
 
 config BIG_ENDIAN
        bool
 
+config USES_INITRAMFS
+       bool
+
 config USES_SQUASHFS
        bool
 
@@ -35,6 +41,12 @@ config USES_JFFS2
 config USES_EXT2
        bool
 
+config USES_TGZ
+       bool
+
+config USES_CPIOGZ
+       bool
+
 config PROFILE_KCONFIG 
        bool
 
@@ -42,7 +54,10 @@ config PROFILE_KCONFIG
 
 config i386
        bool
-       
+
+config i686
+       bool 
+
 config mips
        select BIG_ENDIAN
        bool
@@ -99,6 +114,7 @@ config ARCH
        default "avr32"   if avr32
        default "cris"    if cris
        default "i386"    if i386
+       default "i686"    if i686
        default "m68k"    if m68k
        default "mips"    if mips
        default "mipsel"  if mipsel