sh: mach-edosk7705: Kill off machtype, consolidate board def.

Trivial shuffling and tidying. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
mariux64 · Oct 29, 2010 · c819cc7 · c819cc7
1 parent c1cfed3
commit c819cc7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/arch/sh/Makefile b/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/arch/sh/boards/Makefile b/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/arch/sh/boards/mach-edosk7705/setup.c → arch/sh/boards/board-edosk7705.c b/arch/sh/boards/mach-edosk7705/setup.c → 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/arch/sh/boards/mach-edosk7705/Makefile b/arch/sh/boards/mach-edosk7705/Makefile
diff --git a/arch/sh/include/mach-common/mach/edosk7705.h b/arch/sh/include/mach-common/mach/edosk7705.h