aboutsummaryrefslogtreecommitdiffstats
path: root/usr/initramfs_data.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 11:05:58 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 11:05:58 +0100
commitcd80a8142efa3468c2cd9fb52845f334c3220d54 (patch)
tree919e88994bd3c09b34ce852d0a09bb0655d231d0 /usr/initramfs_data.S
parentgeneric-ipi: eliminate WARN_ON()s during oops/panic (diff)
parentMerge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' an... (diff)
downloadlinux-cd80a8142efa3468c2cd9fb52845f334c3220d54.tar.gz
linux-cd80a8142efa3468c2cd9fb52845f334c3220d54.zip
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'usr/initramfs_data.S')
-rw-r--r--usr/initramfs_data.S2
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"