aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-23 14:23:50 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-01-28 13:18:56 +0900
commit03713bd226caece8e089490a47f093f5193e5e96 (patch)
tree18df86664df2f023fd35a94c57c9a942e9cfdedc
parent3e0137f6c7852aff12db0da7bb45f8b3a0a704c8 (diff)
sh: Move mach-cayman in with the rest of the boards.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/Makefile5
-rw-r--r--arch/sh/boards/cayman/Makefile (renamed from arch/sh/mach-cayman/Makefile)0
-rw-r--r--arch/sh/boards/cayman/irq.c (renamed from arch/sh/mach-cayman/irq.c)0
-rw-r--r--arch/sh/boards/cayman/led.c (renamed from arch/sh/mach-cayman/led.c)0
-rw-r--r--arch/sh/boards/cayman/setup.c (renamed from arch/sh/mach-cayman/setup.c)0
-rw-r--r--arch/sh/kernel/time_64.c1
-rw-r--r--arch/sh/tools/mach-types1
7 files changed, 2 insertions, 5 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 6eb3ee2f3fd..f7cbc13fd2a 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -131,6 +131,7 @@ machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE) += se/7206
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 @@ core-y += $(addprefix arch/sh/boards/, \
$(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
index 489a8f86736..489a8f86736 100644
--- a/arch/sh/mach-cayman/Makefile
+++ b/arch/sh/boards/cayman/Makefile
diff --git a/arch/sh/mach-cayman/irq.c b/arch/sh/boards/cayman/irq.c
index 30ec7bebfaf..30ec7bebfaf 100644
--- a/arch/sh/mach-cayman/irq.c
+++ b/arch/sh/boards/cayman/irq.c
diff --git a/arch/sh/mach-cayman/led.c b/arch/sh/boards/cayman/led.c
index b4e122fd950..b4e122fd950 100644
--- a/arch/sh/mach-cayman/led.c
+++ b/arch/sh/boards/cayman/led.c
diff --git a/arch/sh/mach-cayman/setup.c b/arch/sh/boards/cayman/setup.c
index 8c9fa472d8f..8c9fa472d8f 100644
--- a/arch/sh/mach-cayman/setup.c
+++ b/arch/sh/boards/cayman/setup.c
diff --git a/arch/sh/kernel/time_64.c b/arch/sh/kernel/time_64.c
index e6f54572cd9..81003af8115 100644
--- a/arch/sh/kernel/time_64.c
+++ b/arch/sh/kernel/time_64.c
@@ -353,7 +353,6 @@ static __init unsigned int get_cpu_hz(void)
* 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 ff071693325..af4b7aa9a6b 100644
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -45,3 +45,4 @@ X3PROTO SH_X3PROTO
MAGICPANELR2 SH_MAGIC_PANEL_R2
R2D_PLUS RTS7751R2D_PLUS
R2D_1 RTS7751R2D_1
+CAYMAN SH_CAYMAN