Merge commit 'kumar/next' into merge

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

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 1aa47001aa3b065b1b0d4f3a5387a0447bda5cb0..91e6f5c95dc161806e7a6199ef38727c5b0a4563 100644 (file)
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -6,3 +6,4 @@ obj-y += clock.o clock-7x01a.o
 
 obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
 
+obj-$(CONFIG_MACH_TROUT) += board-dream.o