X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/02eae88c3599c13df02546694887b629e8892fd0..41fdecb111a35a94f65df559eaa363947e5f4e10:/target/linux/Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 5257c78ad..9bcb61cd2 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,4 +1,10 @@
 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"
@@ -10,12 +16,13 @@ menu "Target Root Filesystem"
 		bool "squashfs-lzma"
 		default y
 		depends !LINUX_2_6_ARUBA
+		depends !LINUX_2_6_XSCALE
 		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
 		help
 		  Build a compressed tar archive of the the root filesystem
 
@@ -53,6 +60,13 @@ config PACKAGE_KMOD_IMQ
         help
           Kernel support for the Intermediate Queueing device
 
+config PACKAGE_KMOD_IPIP
+	prompt "kmod-ipip......................... IP in IP encapsulation support"
+	tristate
+	default m
+	help
+	  Kernel module for IP in IP encapsulation
+
 config PACKAGE_KMOD_IPV6
 	prompt "kmod-ipv6......................... IPv6 support"
 	tristate
@@ -294,7 +308,7 @@ config PACKAGE_KMOD_IDE
 	    - ide-core
 	    - ide-detect
 	    - ide-disk
-	    - pdc202old
+	    - pdc202xx_old
 
 config PACKAGE_KMOD_LOOP
 	prompt "kmod-loop......................... Loop mount support"
@@ -316,7 +330,7 @@ config PACKAGE_KMOD_CRYPTO
 	prompt "CryptoAPI modules"
 	tristate
 	default m
-	select BUSYBOX_FEATURE_CHECK_TAINTED_MODULE
+	select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 	help
 	  Kernel modules for cryptographic algorithms