diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-01-06 00:48:31 +0300 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-01-06 00:48:31 +0300 |
commit | c8531ab343dec88ed8005e403b1b304c710b7494 (patch) | |
tree | 40bef451a13ca4b3d54645e69d03c14631364e89 /drivers/block/Kconfig | |
parent | 2e9f3bddcbc711bb14d86c6f068a779bf3710247 (diff) | |
download | linux-c8531ab343dec88ed8005e403b1b304c710b7494.tar.xz |
bzip2/lzma: proper Kconfig dependencies for the ramdisk options
Impact: Partial resolution of build failure
Make all the compression algorithms properly configurable, and make
sure the ramdisk options pull in the proper compression algorithms, as
they should.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r-- | drivers/block/Kconfig | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 795594442428..cc9fa69c1ce4 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -358,10 +358,20 @@ 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. @@ -370,19 +380,11 @@ 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 RD_GZIP - bool "Initial ramdisk compressed using gzip" - default y - depends on BLK_DEV_INITRD=y - select ZLIB_INFLATE - help - Support loading of a gzip encoded initial ramdisk or cpio buffer. - If unsure, say Y. - config CDROM_PKTCDVD tristate "Packet writing on CD/DVD media" depends on !UML |