diff options
| -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 | |||
| 134 | machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast | 134 | machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast |
| 135 | machdir-$(CONFIG_SH_SH03) += mach-sh03 | 135 | machdir-$(CONFIG_SH_SH03) += mach-sh03 |
| 136 | machdir-$(CONFIG_SH_RTS7751R2D) += mach-r2d | 136 | machdir-$(CONFIG_SH_RTS7751R2D) += mach-r2d |
| 137 | machdir-$(CONFIG_SH_EDOSK7705) += mach-edosk7705 | ||
| 138 | machdir-$(CONFIG_SH_HIGHLANDER) += mach-highlander | 137 | machdir-$(CONFIG_SH_HIGHLANDER) += mach-highlander |
| 139 | machdir-$(CONFIG_SH_MIGOR) += mach-migor | 138 | machdir-$(CONFIG_SH_MIGOR) += mach-migor |
| 140 | machdir-$(CONFIG_SH_AP325RXA) += mach-ap325rxa | 139 | 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 | |||
| 7 | obj-$(CONFIG_SH_SH7785LCR) += board-sh7785lcr.o | 7 | obj-$(CONFIG_SH_SH7785LCR) += board-sh7785lcr.o |
| 8 | obj-$(CONFIG_SH_URQUELL) += board-urquell.o | 8 | obj-$(CONFIG_SH_URQUELL) += board-urquell.o |
| 9 | obj-$(CONFIG_SH_SHMIN) += board-shmin.o | 9 | obj-$(CONFIG_SH_SHMIN) += board-shmin.o |
| 10 | obj-$(CONFIG_SH_EDOSK7705) += board-edosk7705.o | ||
| 10 | obj-$(CONFIG_SH_EDOSK7760) += board-edosk7760.o | 11 | obj-$(CONFIG_SH_EDOSK7760) += board-edosk7760.o |
| 11 | obj-$(CONFIG_SH_ESPT) += board-espt.o | 12 | obj-$(CONFIG_SH_ESPT) += board-espt.o |
| 12 | obj-$(CONFIG_SH_POLARIS) += board-polaris.o | 13 | 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 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/smc91x.h> | 15 | #include <linux/smc91x.h> |
| 16 | #include <mach/edosk7705.h> | ||
| 17 | #include <asm/machvec.h> | 16 | #include <asm/machvec.h> |
| 18 | #include <asm/sizes.h> | 17 | #include <asm/sizes.h> |
| 19 | 18 | ||
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 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the EDOSK7705 specific parts of the kernel | ||
| 3 | # | ||
| 4 | |||
| 5 | 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 @@ | |||
| 1 | #ifndef __ASM_SH_EDOSK7705_H | ||
| 2 | #define __ASM_SH_EDOSK7705_H | ||
| 3 | |||
| 4 | #define __IO_PREFIX sh_edosk7705 | ||
| 5 | #include <asm/io_generic.h> | ||
| 6 | |||
| 7 | #endif /* __ASM_SH_EDOSK7705_H */ | ||
