---

yaml --- r: 192145 b: refs/heads/master c: 2012e49 h: refs/heads/master i: 192143: d0edc45 v: v3
git-mirror · May 12, 2010 · 13446b5 · 13446b5
1 parent 2c45235
commit 13446b5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43b39f9f040fd49a094222f70857e3690ce653a3
+refs/heads/master: 2012e49e8ad4ae432cf1667e945b0f335c3e6d38
diff --git a/trunk/arch/arm/mach-msm/Makefile b/trunk/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/trunk/arch/arm/mach-msm/board-dream.c → trunk/arch/arm/mach-msm/board-trout.c b/trunk/arch/arm/mach-msm/board-dream.c → trunk/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/trunk/arch/arm/mach-msm/board-dream.h → trunk/arch/arm/mach-msm/board-trout.h b/trunk/arch/arm/mach-msm/board-dream.h → trunk/arch/arm/mach-msm/board-trout.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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