summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-11 16:35:00 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-11 16:35:00 +0200
commit42578c82e0f1810a07ebe29cb05e874893243d8c (patch)
treee2a3811677d3594e891fc82c940438f6b6abc3e0 /arch/arm/mach-realview/Makefile
parentMerge branch 'w90x900' into devel (diff)
parentFix the VFP handling on the Feroceon CPU (diff)
downloadlinux-42578c82e0f1810a07ebe29cb05e874893243d8c.tar.xz
linux-42578c82e0f1810a07ebe29cb05e874893243d8c.zip
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Conflicts: arch/arm/Kconfig arch/arm/kernel/smp.c arch/arm/mach-realview/Makefile arch/arm/mach-realview/platsmp.c
Diffstat (limited to 'arch/arm/mach-realview/Makefile')
-rw-r--r--arch/arm/mach-realview/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index e13d0947ad0b..e704edb733c0 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o
obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o
obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o
obj-$(CONFIG_MACH_REALVIEW_PBA8) += realview_pba8.o
+obj-$(CONFIG_MACH_REALVIEW_PBX) += realview_pbx.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o