kernel: merge regression fixes for the netfilter patches to the 3.1 kernel patches...

[openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index f881245..9e0263e 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -2,10 +2,9 @@ source "tmp/.config-target.in"
 
 # Kernel/Hardware features
 
 
 # Kernel/Hardware features
 

-config LINUX_2_4
-       bool
-
-config LINUX_2_6
+config HAS_SPE_FPU
+       depends powerpc
+       select HAS_FPU

        bool
 
 config HAS_FPU
        bool
 
 config HAS_FPU


@@ -14,9 +13,6 @@ config HAS_FPU
 config AUDIO_SUPPORT
        bool
 
 config AUDIO_SUPPORT
        bool
 

-config DISPLAY_SUPPORT
-       bool
-

 config GPIO_SUPPORT
        bool
 
 config GPIO_SUPPORT
        bool
 


@@ -34,6 +30,9 @@ config USB_SUPPORT
        select AUDIO_SUPPORT
        bool
 
        select AUDIO_SUPPORT
        bool
 

+config USB_GADGET_SUPPORT
+       bool
+

 config BIG_ENDIAN
        bool
 
 config BIG_ENDIAN
        bool
 


@@ -46,10 +45,10 @@ config USES_SQUASHFS
 config USES_JFFS2
        bool
 
 config USES_JFFS2
        bool
 

-config USES_EXT2
+config USES_EXT4

        bool
 
        bool
 

-config USES_TGZ
+config USES_TARGZ

        bool
 
 config USES_CPIOGZ
        bool
 
 config USES_CPIOGZ