sh: Move mach-cayman in with the rest of the boards.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 6eb3ee2..f7cbc13 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -131,6 +131,7 @@
machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE) += se/7619
machdir-$(CONFIG_SH_LBOX_RE2) += lboxre2
machdir-$(CONFIG_SH_MAGIC_PANEL_R2) += magicpanelr2
+machdir-$(CONFIG_SH_CAYMAN) += cayman
incdir-y := $(notdir $(machdir-y))
@@ -139,10 +140,6 @@
$(filter-out ., $(patsubst %,%/,$(machdir-y))))
endif
-# SH-5 mach types
-# XXX.. to be reconciled with machdir-y later.
-core-$(CONFIG_SH_CAYMAN) += arch/sh/mach-cayman/
-
# Companion chips
core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/
core-$(CONFIG_MFD_SM501) += arch/sh/cchips/voyagergx/
diff --git a/arch/sh/mach-cayman/Makefile b/arch/sh/boards/cayman/Makefile
similarity index 100%
rename from arch/sh/mach-cayman/Makefile
rename to arch/sh/boards/cayman/Makefile
diff --git a/arch/sh/mach-cayman/irq.c b/arch/sh/boards/cayman/irq.c
similarity index 100%
rename from arch/sh/mach-cayman/irq.c
rename to arch/sh/boards/cayman/irq.c
diff --git a/arch/sh/mach-cayman/led.c b/arch/sh/boards/cayman/led.c
similarity index 100%
rename from arch/sh/mach-cayman/led.c
rename to arch/sh/boards/cayman/led.c
diff --git a/arch/sh/mach-cayman/setup.c b/arch/sh/boards/cayman/setup.c
similarity index 100%
rename from arch/sh/mach-cayman/setup.c
rename to arch/sh/boards/cayman/setup.c
diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c
index e6f5457..81003af 100644
--- a/arch/sh/kernel/time_64.c
+++ b/arch/sh/kernel/time_64.c
@@ -353,7 +353,6 @@
* wrap-around (128) and CUI interrupt being raised (64).
*/
return count*2;
-#endif
}
static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id)
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index ff07169..af4b7aa 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -45,3 +45,4 @@
MAGICPANELR2 SH_MAGIC_PANEL_R2
R2D_PLUS RTS7751R2D_PLUS
R2D_1 RTS7751R2D_1
+CAYMAN SH_CAYMAN