diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /arch/s390/kernel/vmlinux.lds.S | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'arch/s390/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 89fdb3808bc0..9289face3027 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <asm-generic/vmlinux.lds.h> | 5 | #include <asm-generic/vmlinux.lds.h> |
| 6 | #include <linux/config.h> | 6 | #include <linux/config.h> |
| 7 | 7 | ||
| 8 | #ifndef CONFIG_ARCH_S390X | 8 | #ifndef CONFIG_64BIT |
| 9 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") | 9 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") |
| 10 | OUTPUT_ARCH(s390) | 10 | OUTPUT_ARCH(s390) |
| 11 | ENTRY(_start) | 11 | ENTRY(_start) |