From 7c33c4527b237fd2bec99ac244db0148a54bfee9 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 7 Jan 2009 00:03:49 -0800
Subject: [PATCH] --- yaml --- r: 137047 b: refs/heads/master c:
 fb9a4ca9820fd4d7c4906bd393004662451e273e h: refs/heads/master i:   137045:
 d71ea62ecc5b96f82610d338f37a7671296b4a16   137043:
 23a89da413d2bc6b86a5e43f6e0bd3bd92f58daf   137039:
 8b32afa4db86934262f2ab0013169a7c0f20c191 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/block/Kconfig | 27 ---------------------------
 trunk/usr/Kconfig           | 27 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 8d88eac72db5..fa58b08c96b0 100644
--- 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
index cc9fa69c1ce4..0344a8a8321d 100644
--- 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
index 86cecb59dd07..a691a8f5898b 100644
--- 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.