Merge master.kernel.org:/home/rmk/linux-2.6-serial

[deliverable/linux.git] / arch / arm / common / Makefile

diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index c81a2ff6b5be35a5541dd7eabc94416023322b92..847e3e6356c67b10bb7c89b53dce4d471c6be142 100644 (file)
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -15,3 +15,4 @@ 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