diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-14 16:01:55 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-14 16:01:55 -0500 |
| commit | 8990c1bc4be46473ad19bf2fa612ca57286f3df4 (patch) | |
| tree | 3cea60576903a1d26c67e6ec62891b524d390e95 /usr/initramfs_data.S | |
| parent | 2979076fbf17a0947d6eba367b0cac19c907c160 (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
Diffstat (limited to 'usr/initramfs_data.S')
| -rw-r--r-- | usr/initramfs_data.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index b9efed5e35cc..792a750d9441 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S | |||
| @@ -30,8 +30,8 @@ __irf_end: | |||
| 30 | .section .init.ramfs.info,"a" | 30 | .section .init.ramfs.info,"a" |
| 31 | .globl __initramfs_size | 31 | .globl __initramfs_size |
| 32 | __initramfs_size: | 32 | __initramfs_size: |
| 33 | #ifdef CONFIG_32BIT | 33 | #ifdef CONFIG_64BIT |
| 34 | .long __irf_end - __irf_start | ||
| 35 | #else | ||
| 36 | .quad __irf_end - __irf_start | 34 | .quad __irf_end - __irf_start |
| 35 | #else | ||
| 36 | .long __irf_end - __irf_start | ||
| 37 | #endif | 37 | #endif |