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/mm/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/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 480f78a3611a..64149d9e55a5 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile | |||
| @@ -70,6 +70,7 @@ obj-$(CONFIG_CPU_SA110) += proc-sa110.o | |||
| 70 | obj-$(CONFIG_CPU_SA1100) += proc-sa1100.o | 70 | obj-$(CONFIG_CPU_SA1100) += proc-sa1100.o |
| 71 | obj-$(CONFIG_CPU_XSCALE) += proc-xscale.o | 71 | obj-$(CONFIG_CPU_XSCALE) += proc-xscale.o |
| 72 | obj-$(CONFIG_CPU_XSC3) += proc-xsc3.o | 72 | obj-$(CONFIG_CPU_XSC3) += proc-xsc3.o |
| 73 | obj-$(CONFIG_CPU_MOHAWK) += proc-mohawk.o | ||
| 73 | obj-$(CONFIG_CPU_FEROCEON) += proc-feroceon.o | 74 | obj-$(CONFIG_CPU_FEROCEON) += proc-feroceon.o |
| 74 | obj-$(CONFIG_CPU_V6) += proc-v6.o | 75 | obj-$(CONFIG_CPU_V6) += proc-v6.o |
| 75 | obj-$(CONFIG_CPU_V7) += proc-v7.o | 76 | obj-$(CONFIG_CPU_V7) += proc-v7.o |