diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 23:50:25 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 23:50:25 +0400 |
commit | 3960208f9ca0cf6bdb31c21c59ac0526303f8b34 (patch) | |
tree | ca1948cec8fb390e5298498361194db145e2e49f /arch/avr32/Makefile | |
parent | b0b73cb41d56ee391f20cbd3e4304e2303a8829b (diff) | |
parent | 47cc3e780474be2e462278d63d77c27a493b28ed (diff) | |
download | linux-3960208f9ca0cf6bdb31c21c59ac0526303f8b34.tar.xz |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Wire up sys_utimensat
[AVR32] Fix section mismatch .taglist -> .init.text
[AVR32] Implement dma_{alloc,free}_writecombine()
AVR32: Spinlock initializer cleanup
[AVR32] Use correct config symbol when setting cpuflags
Diffstat (limited to 'arch/avr32/Makefile')
-rw-r--r-- | arch/avr32/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile index 6115fc1f0cfa..dc6bc01f232c 100644 --- a/arch/avr32/Makefile +++ b/arch/avr32/Makefile @@ -16,7 +16,7 @@ AFLAGS += -mrelax -mno-pic CFLAGS_MODULE += -mno-relax LDFLAGS_vmlinux += --relax -cpuflags-$(CONFIG_CPU_AP7000) += -mcpu=ap7000 +cpuflags-$(CONFIG_CPU_AT32AP7000) += -mcpu=ap7000 CFLAGS += $(cpuflags-y) AFLAGS += $(cpuflags-y) |