refresh patches and remove trailing whitespaces

[openwrt/openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 458a3b3bce8c954206cccef4193040b0b56e2435..f3db905f2444bcddb885099c9c1fafec37d1bd6d 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -26,7 +26,6 @@ menu "Target Images"
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends TARGET_ROOTFS_INITRAMFS
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends TARGET_ROOTFS_INITRAMFS

-                       depends !LINUX_2_6_25

                        help
                          Select ramdisk compression.
 
                        help
                          Select ramdisk compression.
 


@@ -62,12 +61,12 @@ menu "Target Images"
 
        comment "Root filesystem images"
 
 
        comment "Root filesystem images"
 

-       config TARGET_ROOTFS_EXT2FS
-               bool "ext2"
-               default y if USES_EXT2
+       config TARGET_ROOTFS_EXT4FS
+               bool "ext4"
+               default y if USES_EXT4

                depends !TARGET_ROOTFS_INITRAMFS
                help
                depends !TARGET_ROOTFS_INITRAMFS
                help

-                 Ext2 file system with some free space for uml images
+                 Ext4 file system with some free space for uml images

 
        config TARGET_ROOTFS_ISO
                bool "iso"
 
        config TARGET_ROOTFS_ISO
                bool "iso"


@@ -103,14 +102,14 @@ menu "Target Images"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"

-               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532
+               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532

                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"
                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"

-               depends TARGET_ROOTFS_EXT2FS
+               depends TARGET_ROOTFS_EXT4FS

                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem
                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem