diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 22:04:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 22:04:22 -0400 |
| commit | e9dd54da0ba494bd86c45bdf574a6fd6ff8f2210 (patch) | |
| tree | f1a5479b435879d6d0e5acfcdbbc2fb7b92bb183 /arch | |
| parent | 0988c37c248e824953d95a11412696c348dbca91 (diff) | |
| parent | 4a0a088970a553e9f89d23eec688932f689d57f9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: pass -m32 when building vmlinux.lds
sparc: Fixes the DRM layer build on sparc.
ide: merge <asm-sparc/ide_64.h> with <asm-sparc/ide_32.h>
ide: <asm-sparc/ide_64.h>: use __raw_{read,write}w()
ide: <asm-sparc/ide_32.h>: use __raw_{read,write}w()
ide: <asm-sparc/ide_64.h>: use %r0 for outw_be()
sparc64: Do not define BIO_VMERGE_BOUNDARY.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index fef28e267a52..6668e6037af6 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
| @@ -18,6 +18,7 @@ CHECKFLAGS += -D__sparc__ | |||
| 18 | #KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7 | 18 | #KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7 |
| 19 | KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 | 19 | KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 |
| 20 | KBUILD_AFLAGS += -m32 | 20 | KBUILD_AFLAGS += -m32 |
| 21 | CPPFLAGS_vmlinux.lds += -m32 | ||
| 21 | 22 | ||
| 22 | #LDFLAGS_vmlinux = -N -Ttext 0xf0004000 | 23 | #LDFLAGS_vmlinux = -N -Ttext 0xf0004000 |
| 23 | # Since 2.5.40, the first stage is left not btfix-ed. | 24 | # Since 2.5.40, the first stage is left not btfix-ed. |