diff options
| author | Alain Knaff <alain@knaff.lu> | 2009-01-07 09:10:27 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-01-07 09:10:27 +0100 |
| commit | a26ee60f90daffe1de6be0d093af86e7279b3dfd (patch) | |
| tree | 01239fb6b173ff46711480b9601c69b92e1715a5 /usr/initramfs_data.S | |
| parent | bzip2/lzma: move initrd/ramfs options out of BLK_DEV (diff) | |
| download | linux-a26ee60f90daffe1de6be0d093af86e7279b3dfd.tar.xz linux-a26ee60f90daffe1de6be0d093af86e7279b3dfd.zip | |
bzip2/lzma: fix built-in initramfs vs CONFIG_RD_GZIP
Impact: Resolves build failures in some configurations
Makes it possible to disable CONFIG_RD_GZIP . In that case, the
built-in initramfs will be compressed by whatever compressor is
available (bzip2 or lzma) or left uncompressed if none is available.
It also removes a couple of warnings which occur when no ramdisk
compression at all is chosen.
It also restores the select ZLIB_INFLATE in drivers/block/Kconfig
which somehow came missing. This is needed to activate compilation of
the stuff in zlib_deflate.
Signed-off-by: Alain Knaff <alain@knaff.lu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'usr/initramfs_data.S')
| -rw-r--r-- | usr/initramfs_data.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index c2e1ad424f4a..7c6973d8d829 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -26,5 +26,5 @@ SECTIONS */ .section .init.ramfs,"a" -.incbin "usr/initramfs_data.cpio.gz" +.incbin "usr/initramfs_data.cpio" |