From 911ae52e8b6ce91599825b36e3aa5ff6aa0103d8 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 15 Feb 2011 16:26:41 +0900
Subject: [PATCH] --- yaml --- r: 233903 b: refs/heads/master c:
 d60cf53a30956e47919788b2ef49287786a959c9 h: refs/heads/master i:   233901:
 6af35bf5976c9c1b611ece0806bf1994a92e3598   233899:
 c70b4c80b650fb88ab77527e21514b546f48ed27   233895:
 7befe290d777bde1a77774fc521f43dd3ca54569   233887:
 81ff3b1a42fb6e3e4abc6626936b95cbb41017e3 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 783092f904db..39cf449ee5fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13c12a4e8ecdf3998cd2d89ade69f6f194819c95
+refs/heads/master: d60cf53a30956e47919788b2ef49287786a959c9
diff --git a/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index 672944f5b19c..e53b4b38bd11 100644
--- a/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -14,7 +14,7 @@
 #include <linux/io.h>
 #include <linux/sh_timer.h>
 #include <linux/serial_sci.h>
-#include <asm/machtypes.h>
+#include <generated/machtypes.h>
 
 static struct resource rtc_resources[] = {
 	[0] = {
@@ -255,12 +255,17 @@ static struct platform_device *sh7750_early_devices[] __initdata = {
 
 void __init plat_early_device_setup(void)
 {
+	struct platform_device *dev[1];
+
 	if (mach_is_rts7751r2d()) {
 		scif_platform_data.scscr |= SCSCR_CKE1;
-		early_platform_add_devices(&scif_device, 1);
+		dev[0] = &scif_device;
+		early_platform_add_devices(dev, 1);
 	} else {
-		early_platform_add_devices(&sci_device, 1);
-		early_platform_add_devices(&scif_device, 1);
+		dev[0] = &sci_device;
+		early_platform_add_devices(dev, 1);
+		dev[0] = &scif_device;
+		early_platform_add_devices(dev, 1);
 	}
 
 	early_platform_add_devices(sh7750_early_devices,