---

yaml --- r: 137047 b: refs/heads/master c: fb9a4ca h: refs/heads/master i: 137045: d71ea62 137043: 23a89da 137039: 8b32afa v: v3
git-mirror · Jan 7, 2009 · 7c33c45 · 7c33c45
1 parent 281a83c
commit 7c33c45
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7856a16ea03ed9b17860d756ee6473c2e57882b2
+refs/heads/master: fb9a4ca9820fd4d7c4906bd393004662451e273e
diff --git a/trunk/drivers/block/Kconfig b/trunk/drivers/block/Kconfig
@@ -358,33 +358,6 @@ config BLK_DEV_XIP
 	  will prevent RAM block device backing store memory from being
 	  allocated from highmem (only a problem for highmem systems).
 
-config RD_GZIP
-	bool "Initial ramdisk compressed using gzip"
-	default y
-	depends on BLK_DEV_INITRD=y
-	select DECOMPRESS_GZIP
-	help
-	  Support loading of a gzip encoded initial ramdisk or cpio buffer.
-	  If unsure, say Y.
-
-config RD_BZIP2
-	bool "Initial ramdisk compressed using bzip2"
-	default n
-	depends on BLK_DEV_INITRD=y
-	select DECOMPRESS_BZIP2
-	help
-	  Support loading of a bzip2 encoded initial ramdisk or cpio buffer
-	  If unsure, say N.
-
-config RD_LZMA
-	bool "Initial ramdisk compressed using lzma"
-	default n
-	depends on BLK_DEV_INITRD=y
-	select DECOMPRESS_LZMA
-	help
-	  Support loading of a lzma encoded initial ramdisk or cpio buffer
-	  If unsure, say N.
-
 config CDROM_PKTCDVD
 	tristate "Packet writing on CD/DVD media"
 	depends on !UML

diff --git a/trunk/usr/Kconfig b/trunk/usr/Kconfig
@@ -44,3 +44,30 @@ config INITRAMFS_ROOT_GID
 	  owned by group root in the initial ramdisk image.
 
 	  If you are not sure, leave it set to "0".
+
+config RD_GZIP
+	bool "Initial ramdisk compressed using gzip"
+	default y
+	depends on BLK_DEV_INITRD=y
+	select DECOMPRESS_GZIP
+	help
+	  Support loading of a gzip encoded initial ramdisk or cpio buffer.
+	  If unsure, say Y.
+
+config RD_BZIP2
+	bool "Initial ramdisk compressed using bzip2"
+	default n
+	depends on BLK_DEV_INITRD=y
+	select DECOMPRESS_BZIP2
+	help
+	  Support loading of a bzip2 encoded initial ramdisk or cpio buffer
+	  If unsure, say N.
+
+config RD_LZMA
+	bool "Initial ramdisk compressed using lzma"
+	default n
+	depends on BLK_DEV_INITRD=y
+	select DECOMPRESS_LZMA
+	help
+	  Support loading of a lzma encoded initial ramdisk or cpio buffer
+	  If unsure, say N.