diff options
author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /arch/arm/kernel/Makefile | |
parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r-- | arch/arm/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index ca60d335e8fa..11a5197a221f 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -36,6 +36,7 @@ AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312 | |||
36 | 36 | ||
37 | obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o | 37 | obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o |
38 | obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o | 38 | obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o |
39 | obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o | ||
39 | obj-$(CONFIG_IWMMXT) += iwmmxt.o | 40 | obj-$(CONFIG_IWMMXT) += iwmmxt.o |
40 | AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt | 41 | AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt |
41 | 42 | ||