diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-03 20:29:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-03 20:29:19 -0500 |
| commit | 91d75e209bd59695f0708d66964d928d45b3b2f3 (patch) | |
| tree | 32cab1359d951e4193bebb181a0f0319824a2b95 /usr/initramfs_data.S | |
| parent | 9976b39b5031bbf76f715893cf080b6a17683881 (diff) | |
| parent | 8b0e5860cb099d7958d13b00ffbc35ad02735700 (diff) | |
Merge branch 'x86/core' into core/percpu
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 c2e1ad424f4..7c6973d8d82 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S | |||
| @@ -26,5 +26,5 @@ SECTIONS | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | .section .init.ramfs,"a" | 28 | .section .init.ramfs,"a" |
| 29 | .incbin "usr/initramfs_data.cpio.gz" | 29 | .incbin "usr/initramfs_data.cpio" |
| 30 | 30 | ||