diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 10:53:31 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 10:53:31 -0500 |
| commit | 474b9c86b0c65e9ca6a77d8b7bf132c4d5993b9c (patch) | |
| tree | 9ce213f7a268d13f8871b84f1d22c2b9ff55afcf /usr/initramfs_data.S | |
| parent | 49db7e7b995f5c61c5e24198f833ed01d99f5e7d (diff) | |
| parent | fdea0571ddca8e3f22448f66d72a034575abea28 (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38
Diffstat (limited to 'usr/initramfs_data.S')
| -rw-r--r-- | usr/initramfs_data.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index 792a750d9441..c14322d1c0cf 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S | |||
| @@ -22,14 +22,15 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/stringify.h> | 24 | #include <linux/stringify.h> |
| 25 | #include <asm-generic/vmlinux.lds.h> | ||
| 25 | 26 | ||
| 26 | .section .init.ramfs,"a" | 27 | .section .init.ramfs,"a" |
| 27 | __irf_start: | 28 | __irf_start: |
| 28 | .incbin __stringify(INITRAMFS_IMAGE) | 29 | .incbin __stringify(INITRAMFS_IMAGE) |
| 29 | __irf_end: | 30 | __irf_end: |
| 30 | .section .init.ramfs.info,"a" | 31 | .section .init.ramfs.info,"a" |
| 31 | .globl __initramfs_size | 32 | .globl VMLINUX_SYMBOL(__initramfs_size) |
| 32 | __initramfs_size: | 33 | VMLINUX_SYMBOL(__initramfs_size): |
| 33 | #ifdef CONFIG_64BIT | 34 | #ifdef CONFIG_64BIT |
| 34 | .quad __irf_end - __irf_start | 35 | .quad __irf_end - __irf_start |
| 35 | #else | 36 | #else |