follow the xtables changes in 2.6.17

[openwrt.git] / target / linux / Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 540e2b7..946ace3 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,8 +1,15 @@
 menu "Target Root Filesystem"
 menu "Target Root Filesystem"

+       config TARGET_ROOTFS_INITRAMFS
+               bool "ramdisk"
+               default n
+               depends LINUX_2_6
+               help
+                 Embed the rootfs into the kernel (initramfs)

 
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y
 
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y

+               depends !TARGET_ROOTFS_INITRAMFS

                help
                  Build a jffs2 root filesystem
 
                help
                  Build a jffs2 root filesystem
 


@@ -11,12 +18,14 @@ menu "Target Root Filesystem"
                default y
                depends !LINUX_2_6_ARUBA
                depends !LINUX_2_6_XSCALE
                default y
                depends !LINUX_2_6_ARUBA
                depends !LINUX_2_6_XSCALE

+               depends !TARGET_ROOTFS_INITRAMFS

                help
                  Build a squashfs-lzma root filesystem
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"
                help
                  Build a squashfs-lzma root filesystem
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"

-               default y
+               default y if !LINUX_2_4_BRCM && !LINUX_2_6_BRCM && !LINUX_2_6_ARUBA && !LINUX_2_4_AR531X
+               depends !TARGET_ROOTFS_INITRAMFS

                help
                  Build a compressed tar archive of the the root filesystem
 
                help
                  Build a compressed tar archive of the the root filesystem