Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

[linux-2.6-omap-h63xx.git] / arch / avr32 / Makefile

diff --git a/arch/avr32/Makefile b/arch/avr32/Makefile
index 6115fc1f0cfab65c06277da9bfc46e8de89ade6c..dc6bc01f232cb3a1b2574ef40e8ff043070ddd7a 100644 (file)
--- 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)