diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /arch/sh/kernel/vmlinux_64.lds.S | |
parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
download | blackbird-op-linux-52833e897fd8c6f62b3e5e27291fa9bc803f7460.tar.gz blackbird-op-linux-52833e897fd8c6f62b3e5e27291fa9bc803f7460.zip |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'arch/sh/kernel/vmlinux_64.lds.S')
-rw-r--r-- | arch/sh/kernel/vmlinux_64.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S index 3f1bd6392bb3..d1e177009a41 100644 --- a/arch/sh/kernel/vmlinux_64.lds.S +++ b/arch/sh/kernel/vmlinux_64.lds.S @@ -51,7 +51,7 @@ SECTIONS KPROBES_TEXT *(.fixup) *(.gnu.warning) -#ifdef CONFIG_LITTLE_ENDIAN +#ifdef CONFIG_CPU_LITTLE_ENDIAN } = 0x6ff0fff0 #else } = 0xf0fff06f |