From 3294a30d64f871ad830b69b7ca6b6c2a33e347b3 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 29 Oct 2010 19:38:19 +0900
Subject: [PATCH] --- yaml --- r: 221663 b: refs/heads/master c:
 c819cc732267d6e46833a8d98bd7677b3d12d7d1 h: refs/heads/master i:   221661:
 498e8281980832883f8a295ff690df5abd7b0868   221659:
 999379143e43e1b9e6c40a52d2b348f01a87fcf9   221655:
 f206f88e7e59ea2bd502091310a18e66f1d4b9f6   221647:
 48e1c3b2d626cbacd4de2adcc78e9735b049f8c9   221631:
 19b12beb28aea10e01468d09634a86e5cb72e9b0 v: v3

---
 [refs]                                                     | 2 +-
 trunk/arch/sh/Makefile                                     | 1 -
 trunk/arch/sh/boards/Makefile                              | 1 +
 .../boards/{mach-edosk7705/setup.c => board-edosk7705.c}   | 1 -
 trunk/arch/sh/boards/mach-edosk7705/Makefile               | 5 -----
 trunk/arch/sh/include/mach-common/mach/edosk7705.h         | 7 -------
 6 files changed, 2 insertions(+), 15 deletions(-)
 rename trunk/arch/sh/boards/{mach-edosk7705/setup.c => board-edosk7705.c} (98%)
 delete mode 100644 trunk/arch/sh/boards/mach-edosk7705/Makefile
 delete mode 100644 trunk/arch/sh/include/mach-common/mach/edosk7705.h

diff --git a/[refs] b/[refs]
index dda05d5d4664..e4bcf6afe617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1cfed3c3a190b4ce1d5a4510d9dfd3d42176fba
+refs/heads/master: c819cc732267d6e46833a8d98bd7677b3d12d7d1
diff --git a/trunk/arch/sh/Makefile b/trunk/arch/sh/Makefile
index 922ff3586b12..9c8c6e1a2a15 100644
--- a/trunk/arch/sh/Makefile
+++ b/trunk/arch/sh/Makefile
@@ -134,7 +134,6 @@ machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx
 machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast
 machdir-$(CONFIG_SH_SH03)			+= mach-sh03
 machdir-$(CONFIG_SH_RTS7751R2D)			+= mach-r2d
-machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705
 machdir-$(CONFIG_SH_HIGHLANDER)			+= mach-highlander
 machdir-$(CONFIG_SH_MIGOR)			+= mach-migor
 machdir-$(CONFIG_SH_AP325RXA)			+= mach-ap325rxa
diff --git a/trunk/arch/sh/boards/Makefile b/trunk/arch/sh/boards/Makefile
index 4a0ed86af8b1..be7d11d04b26 100644
--- a/trunk/arch/sh/boards/Makefile
+++ b/trunk/arch/sh/boards/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_SH_SH2007)		+= board-sh2007.o
 obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o
 obj-$(CONFIG_SH_URQUELL)	+= board-urquell.o
 obj-$(CONFIG_SH_SHMIN)		+= board-shmin.o
+obj-$(CONFIG_SH_EDOSK7705)	+= board-edosk7705.o
 obj-$(CONFIG_SH_EDOSK7760)	+= board-edosk7760.o
 obj-$(CONFIG_SH_ESPT)		+= board-espt.o
 obj-$(CONFIG_SH_POLARIS)	+= board-polaris.o
diff --git a/trunk/arch/sh/boards/mach-edosk7705/setup.c b/trunk/arch/sh/boards/board-edosk7705.c
similarity index 98%
rename from trunk/arch/sh/boards/mach-edosk7705/setup.c
rename to trunk/arch/sh/boards/board-edosk7705.c
index 8f93b6636900..4cb3bb74c36f 100644
--- a/trunk/arch/sh/boards/mach-edosk7705/setup.c
+++ b/trunk/arch/sh/boards/board-edosk7705.c
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/smc91x.h>
-#include <mach/edosk7705.h>
 #include <asm/machvec.h>
 #include <asm/sizes.h>
 
diff --git a/trunk/arch/sh/boards/mach-edosk7705/Makefile b/trunk/arch/sh/boards/mach-edosk7705/Makefile
deleted file mode 100644
index 0cf5715a78b3..000000000000
--- a/trunk/arch/sh/boards/mach-edosk7705/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the EDOSK7705 specific parts of the kernel
-#
-
-obj-y	 := setup.o
diff --git a/trunk/arch/sh/include/mach-common/mach/edosk7705.h b/trunk/arch/sh/include/mach-common/mach/edosk7705.h
deleted file mode 100644
index efc43b323466..000000000000
--- a/trunk/arch/sh/include/mach-common/mach/edosk7705.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_SH_EDOSK7705_H
-#define __ASM_SH_EDOSK7705_H
-
-#define __IO_PREFIX sh_edosk7705
-#include <asm/io_generic.h>
-
-#endif /* __ASM_SH_EDOSK7705_H */