diff options
| author | David Howells <dhowells@redhat.com> | 2009-06-22 10:32:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 16:34:49 -0400 |
| commit | eadfe21989d728b5af936487627b4e288bd805f8 (patch) | |
| tree | bc1b7a09c6bf1e231654cb86ff64e46b9d9cbbfa | |
| parent | 7e0338c0de18c50f09aea1fbef45110cf7d64a3c (diff) | |
LDSCRIPT: Name INIT_RAM_FS consistently
In asm-generic/vmlinux.lds.h, name INIT_RAM_FS consistently, no matter the
setting of CONFIG_BLK_DEV_INITRD. This corrects:
commit ef53dae8658cf0e93d380983824a661067948d87
Author: Sam Ravnborg <sam@ravnborg.org>
Date: Sun Jun 7 20:46:37 2009 +0200
Subject: Improve vmlinux.lds.h support for arch specific linker scripts
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 55413e568f07..92b73b6140ff 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -625,7 +625,7 @@ | |||
| 625 | *(.init.ramfs) \ | 625 | *(.init.ramfs) \ |
| 626 | VMLINUX_SYMBOL(__initramfs_end) = .; | 626 | VMLINUX_SYMBOL(__initramfs_end) = .; |
| 627 | #else | 627 | #else |
| 628 | #define INITRAMFS | 628 | #define INIT_RAM_FS |
| 629 | #endif | 629 | #endif |
| 630 | 630 | ||
| 631 | /** | 631 | /** |