aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@codeaurora.org>2010-03-03 12:34:27 -0500
committerDaniel Walker <dwalker@codeaurora.org>2010-05-12 12:14:33 -0400
commit2012e49e8ad4ae432cf1667e945b0f335c3e6d38 (patch)
tree10517620f633445782b5e40ddab8f74d1d1bf6e9 /arch/arm
parent43b39f9f040fd49a094222f70857e3690ce653a3 (diff)
arm: msm: move board-dream.c to board-trout.c
Move the naming of this board file back to the original Google naming. Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-msm/Makefile2
-rw-r--r--arch/arm/mach-msm/board-trout.c (renamed from arch/arm/mach-msm/board-dream.c)4
-rw-r--r--arch/arm/mach-msm/board-trout.h (renamed from arch/arm/mach-msm/board-dream.h)0
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 0cb523fe3b3e..86bad4f0dc7b 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -7,4 +7,4 @@ obj-y += clock.o clock-7x01a.o
7 7
8obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o 8obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
9 9
10obj-$(CONFIG_MACH_TROUT) += board-dream.o 10obj-$(CONFIG_MACH_TROUT) += board-trout.o
diff --git a/arch/arm/mach-msm/board-dream.c b/arch/arm/mach-msm/board-trout.c
index 21afa8513168..9793ff45deb4 100644
--- a/arch/arm/mach-msm/board-dream.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -1,4 +1,4 @@
1/* linux/arch/arm/mach-msm/board-dream.c 1/* linux/arch/arm/mach-msm/board-trout.c
2 * 2 *
3 * Copyright (C) 2009 Google, Inc. 3 * Copyright (C) 2009 Google, Inc.
4 * Author: Brian Swetland <swetland@google.com> 4 * Author: Brian Swetland <swetland@google.com>
@@ -28,7 +28,7 @@
28#include <mach/msm_iomap.h> 28#include <mach/msm_iomap.h>
29 29
30#include "devices.h" 30#include "devices.h"
31#include "board-dream.h" 31#include "board-trout.h"
32 32
33static struct platform_device *devices[] __initdata = { 33static struct platform_device *devices[] __initdata = {
34 &msm_device_uart3, 34 &msm_device_uart3,
diff --git a/arch/arm/mach-msm/board-dream.h b/arch/arm/mach-msm/board-trout.h
index 4f345a5a0a61..4f345a5a0a61 100644
--- a/arch/arm/mach-msm/board-dream.h
+++ b/arch/arm/mach-msm/board-trout.h