aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-pxa/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-28 14:15:43 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-28 14:15:43 +0000
commitdc52b5bf2c94828fd3c8d26f4ca810d4ba53999a (patch)
treed8bfc950911cbe40f541d0e424650598075fb8be /arch/arm/plat-pxa/Makefile
parentMerge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel (diff)
parent[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0 (diff)
downloadlinux-dev-dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a.tar.xz
linux-dev-dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a.zip
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/plat-pxa/Makefile')
-rw-r--r--arch/arm/plat-pxa/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index 4be37235f57b..8f2c4c7fbd48 100644
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -2,6 +2,8 @@
# Makefile for code common across different PXA processor families
#
-obj-y := dma.o mfp.o
+obj-y := dma.o
obj-$(CONFIG_GENERIC_GPIO) += gpio.o
+obj-$(CONFIG_PXA3xx) += mfp.o
+obj-$(CONFIG_ARCH_MMP) += mfp.o