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

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

diff --git a/arch/arm/mach-ks8695/Makefile b/arch/arm/mach-ks8695/Makefile
index ade42b73afbb2cea2c6c5722be88a2904af65e78..f735d2cc0294474bde6de12ff9f5ffc3331a0367 100644 (file)
--- a/arch/arm/mach-ks8695/Makefile
+++ b/arch/arm/mach-ks8695/Makefile
@@ -16,3 +16,4 @@ obj-$(CONFIG_LEDS)            += leds.o
 
 # Board-specific support
 obj-$(CONFIG_MACH_KS8695)      += board-micrel.o
+obj-$(CONFIG_MACH_DSM320)      += board-dsm320.o