diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 04:11:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 04:11:46 -0500 |
| commit | 90b4d60c6103105a634c495003c2ce931f075f63 (patch) | |
| tree | 033f07fb175a5e0651f6a63fc0fe8e1860555ce5 /arch/s390/boot/compressed/vmlinux.lds.S | |
| parent | bac91462e8a8609d7be02a2cbf5c2b406b04ed9f (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into HEAD
Linux 3.7-rc3
Diffstat (limited to 'arch/s390/boot/compressed/vmlinux.lds.S')
| -rw-r--r-- | arch/s390/boot/compressed/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/compressed/vmlinux.lds.S b/arch/s390/boot/compressed/vmlinux.lds.S index d80f79d8dd9c..8e1fb8239287 100644 --- a/arch/s390/boot/compressed/vmlinux.lds.S +++ b/arch/s390/boot/compressed/vmlinux.lds.S | |||
| @@ -5,7 +5,7 @@ OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") | |||
| 5 | OUTPUT_ARCH(s390:64-bit) | 5 | OUTPUT_ARCH(s390:64-bit) |
| 6 | #else | 6 | #else |
| 7 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") | 7 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") |
| 8 | OUTPUT_ARCH(s390) | 8 | OUTPUT_ARCH(s390:31-bit) |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | ENTRY(startup) | 11 | ENTRY(startup) |