Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / arch / arm / mach-sa1100 / Makefile

diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 89349c1..41252d2 100644 (file)
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -37,6 +37,9 @@ obj-$(CONFIG_SA1100_JORNADA720_SSP)   += jornada720_ssp.o
 obj-$(CONFIG_SA1100_LART)              += lart.o
 led-$(CONFIG_SA1100_LART)              += leds-lart.o
 
+obj-$(CONFIG_SA1100_NANOENGINE)                += nanoengine.o
+obj-$(CONFIG_PCI_NANOENGINE)           += pci-nanoengine.o
+
 obj-$(CONFIG_SA1100_PLEB)              += pleb.o
 
 obj-$(CONFIG_SA1100_SHANNON)           += shannon.o
@@ -47,7 +50,7 @@ led-$(CONFIG_SA1100_SIMPAD)           += leds-simpad.o
 # LEDs support
 obj-$(CONFIG_LEDS) += $(led-y)
 
-# Miscelaneous functions
+# Miscellaneous functions
 obj-$(CONFIG_PM)                       += pm.o sleep.o
 obj-$(CONFIG_SA1100_SSP)               += ssp.o