add io resource patch from #800, merge flash map stuff from linux 2.4 to support...

[openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index 881c6fb..effd9d7 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -106,17 +106,6 @@ config LINUX_2_4_AR7
        help
          Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
 
        help
          Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
 

-config LINUX_2_4_X86
-       bool "x86 [2.4]"
-       select i386
-       select LINUX_2_4
-       select PCI_SUPPORT
-       select USB_SUPPORT
-       select PCMCIA_SUPPORT
-       help
-         Build firmware images for x86 based boards
-         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
-

 config LINUX_2_6_X86
        bool "x86 [2.6]"
        select i386
 config LINUX_2_6_X86
        bool "x86 [2.6]"
        select i386


@@ -124,6 +113,7 @@ config LINUX_2_6_X86
        select PCI_SUPPORT
        select USB_SUPPORT
        select PCMCIA_SUPPORT
        select PCI_SUPPORT
        select USB_SUPPORT
        select PCMCIA_SUPPORT

+       select USES_JFFS2

        help
          Build firmware images for x86 based boards
          (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
        help
          Build firmware images for x86 based boards
          (e.g. Soekris net4521 and net4801, PC Engines WRAP...)