7 files changed, 2 insertions, 5 deletions

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 6eb3ee2f3fd9..f7cbc13fd2a0 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 489a8f867368..489a8f867368 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 30ec7bebfaf1..30ec7bebfaf1 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 b4e122fd9502..b4e122fd9502 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 8c9fa472d8f5..8c9fa472d8f5 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 e6f54572cd96..81003af8115a 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 ff071693325c..af4b7aa9a6b2 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