diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 0cb523fe3b3e1fb2fab9eb4388db66eb0e034b35..86bad4f0dc7bfd76363d10c5e9c257fcf1ccb539 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -7,4 +7,4 @@ obj-y += clock.o clock-7x01a.o
 
 obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
 
-obj-$(CONFIG_MACH_TROUT) += board-dream.o
+obj-$(CONFIG_MACH_TROUT) += board-trout.o
diff --git a/arch/arm/mach-msm/board-dream.c b/arch/arm/mach-msm/board-trout.c
similarity index 97%
rename from arch/arm/mach-msm/board-dream.c
rename to arch/arm/mach-msm/board-trout.c
index 21afa85131687d2577860713737d69dc63a62273..9793ff45deb4333b4e45b5d8587f51532f25bba0 100644
--- a/arch/arm/mach-msm/board-dream.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/mach-msm/board-dream.c
+/* linux/arch/arm/mach-msm/board-trout.c
  *
  * Copyright (C) 2009 Google, Inc.
  * Author: Brian Swetland <swetland@google.com>
@@ -28,7 +28,7 @@
 #include <mach/msm_iomap.h>
 
 #include "devices.h"
-#include "board-dream.h"
+#include "board-trout.h"
 
 static struct platform_device *devices[] __initdata = {
 	&msm_device_uart3,
diff --git a/arch/arm/mach-msm/board-dream.h b/arch/arm/mach-msm/board-trout.h
similarity index 100%
rename from arch/arm/mach-msm/board-dream.h
rename to arch/arm/mach-msm/board-trout.h