diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-29 14:06:53 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-29 14:06:53 +0400 |
| commit | f6eec8d66400714e47add3d8341688a1e86c5de9 (patch) | |
| tree | c8eb2ef3ada5e448503f6013ed1b3e8e1a3009a7 /arch/sh/boards | |
| parent | 39c11984a4f36bd1ce7f90f7506824955f0f4863 (diff) | |
| download | linux-f6eec8d66400714e47add3d8341688a1e86c5de9.tar.xz | |
sh: mach-snapgear: Kill off machtype, consolidate board def.
Only the secureedge5410 was ever supported by this code, so make the
board specification explicit rather than perpetuating a mach group.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards')
| -rw-r--r-- | arch/sh/boards/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/boards/board-secureedge5410.c (renamed from arch/sh/boards/mach-snapgear/setup.c) | 2 | ||||
| -rw-r--r-- | arch/sh/boards/mach-snapgear/Makefile | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile index 38ef655cc0f0..4a0ed86af8b1 100644 --- a/arch/sh/boards/Makefile +++ b/arch/sh/boards/Makefile @@ -2,6 +2,7 @@ # Specific board support, not covered by a mach group. # obj-$(CONFIG_SH_MAGIC_PANEL_R2) += board-magicpanelr2.o +obj-$(CONFIG_SH_SECUREEDGE5410) += board-secureedge5410.o obj-$(CONFIG_SH_SH2007) += board-sh2007.o obj-$(CONFIG_SH_SH7785LCR) += board-sh7785lcr.o obj-$(CONFIG_SH_URQUELL) += board-urquell.o diff --git a/arch/sh/boards/mach-snapgear/setup.c b/arch/sh/boards/board-secureedge5410.c index 10eeea96a04b..32f875e8493d 100644 --- a/arch/sh/boards/mach-snapgear/setup.c +++ b/arch/sh/boards/board-secureedge5410.c @@ -17,7 +17,7 @@ #include <linux/module.h> #include <linux/sched.h> #include <asm/machvec.h> -#include <mach/snapgear.h> +#include <mach/secureedge5410.h> #include <asm/irq.h> #include <asm/io.h> #include <cpu/timer.h> diff --git a/arch/sh/boards/mach-snapgear/Makefile b/arch/sh/boards/mach-snapgear/Makefile deleted file mode 100644 index bc92e34adbb0..000000000000 --- a/arch/sh/boards/mach-snapgear/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the SnapGear specific parts of the kernel -# - -obj-y := setup.o |