Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-sa1100 / Makefile

diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 89349c1dd7a69b2639fe2277a6622f6aa8324b44..e697691eed283bfd1a81681c8a784328d4aa6ba5 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