Merge branch 'topic/asoc' into for-linus

[mv-sheeva.git] / arch / sh / kernel / vmlinux.lds.S

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 8d97f52ce322821679a5c6b1b08bc6176eecb5b3..f53c76acaede2f1af80aaec431e53308c4681bee 100644 (file)
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -6,12 +6,8 @@
 #define LOAD_OFFSET    CONFIG_PAGE_OFFSET
 OUTPUT_ARCH(sh:sh5)
 #else
+#define LOAD_OFFSET    0
 OUTPUT_ARCH(sh)
-#ifdef CONFIG_CPU_LITTLE_ENDIAN
-OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
-#else
-OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-shbig-linux")
-#endif
 #endif
 
 #include <asm/thread_info.h>
@@ -30,12 +26,13 @@ SECTIONS
        . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET;
 #endif
 
+       _text = .;              /* Text and read-only data */
+
        .empty_zero_page : AT(ADDR(.empty_zero_page) - LOAD_OFFSET) {
                *(.empty_zero_page)
        } = 0
 
        .text : AT(ADDR(.text) - LOAD_OFFSET) {
-               _text = .;              /* Text and read-only data */
                HEAD_TEXT
                TEXT_TEXT
 
@@ -131,7 +128,7 @@ SECTIONS
 
 #ifdef CONFIG_BLK_DEV_INITRD
        . = ALIGN(PAGE_SIZE);
-       .init.ramfs : AT(ADDR(.init_ramfs) - LOAD_OFFSET) {
+       .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
                __initramfs_start = .;
                *(.init.ramfs)
                __initramfs_end = .;