diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-29 19:38:19 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-29 19:38:19 +0900 |
| commit | c819cc732267d6e46833a8d98bd7677b3d12d7d1 (patch) | |
| tree | 900969944f57ba2c7e90758217512b9214d7e38a | |
| parent | c1cfed3c3a190b4ce1d5a4510d9dfd3d42176fba (diff) | |
sh: mach-edosk7705: Kill off machtype, consolidate board def.
Trivial shuffling and tidying.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/boards/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/boards/board-edosk7705.c (renamed from arch/sh/boards/mach-edosk7705/setup.c) | 1 | ||||
| -rw-r--r-- | arch/sh/boards/mach-edosk7705/Makefile | 5 | ||||
| -rw-r--r-- | arch/sh/include/mach-common/mach/edosk7705.h | 7 |
5 files changed, 1 insertions, 14 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 922ff3586b12..9c8c6e1a2a15 100644 --- 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 index 4a0ed86af8b1..be7d11d04b26 100644 --- 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 b/arch/sh/boards/board-edosk7705.c index 8f93b6636900..4cb3bb74c36f 100644 --- a/arch/sh/boards/mach-edosk7705/setup.c +++ b/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 deleted file mode 100644 index 0cf5715a78b3..000000000000 --- a/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/arch/sh/include/mach-common/mach/edosk7705.h b/arch/sh/include/mach-common/mach/edosk7705.h deleted file mode 100644 index efc43b323466..000000000000 --- a/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 */ |