Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / arch / arm / common / Makefile

diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index c81a2ff..325e4b6 100644 (file)
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -2,7 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                          += rtctime.o
 obj-$(CONFIG_ARM_GIC)          += gic.o
 obj-$(CONFIG_ARM_VIC)          += vic.o
 obj-$(CONFIG_ICST525)          += icst525.o
@@ -15,3 +14,6 @@ obj-$(CONFIG_SHARP_LOCOMO)    += locomo.o
 obj-$(CONFIG_SHARP_PARAM)      += sharpsl_param.o
 obj-$(CONFIG_SHARPSL_PM)       += sharpsl_pm.o
 obj-$(CONFIG_SHARP_SCOOP)      += scoop.o
+obj-$(CONFIG_ARCH_IXP2000)     += uengine.o
+obj-$(CONFIG_ARCH_IXP23XX)     += uengine.o
+obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o