Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: Move mach-cayman in with the rest of the boards.

Browse source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2007-11-23 14:23:50 +09:00
parent 3e0137f6c7
commit 03713bd226
7 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/sh/Makefile
View file

@ -131,6 +131,7 @@ machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE) += se/7206
machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE) += se/7619 machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE) += se/7619
machdir-$(CONFIG_SH_LBOX_RE2) += lboxre2 machdir-$(CONFIG_SH_LBOX_RE2) += lboxre2
machdir-$(CONFIG_SH_MAGIC_PANEL_R2) += magicpanelr2 machdir-$(CONFIG_SH_MAGIC_PANEL_R2) += magicpanelr2
machdir-$(CONFIG_SH_CAYMAN) += cayman
incdir-y := $(notdir $(machdir-y)) incdir-y := $(notdir $(machdir-y))
@ -139,10 +140,6 @@ core-y += $(addprefix arch/sh/boards/, \
$(filter-out ., $(patsubst %,%/,$(machdir-y)))) $(filter-out ., $(patsubst %,%/,$(machdir-y))))
endif endif
# SH-5 mach types
# XXX.. to be reconciled with machdir-y later.
core-$(CONFIG_SH_CAYMAN) += arch/sh/mach-cayman/
# Companion chips # Companion chips
core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/
core-$(CONFIG_MFD_SM501) += arch/sh/cchips/voyagergx/ core-$(CONFIG_MFD_SM501) += arch/sh/cchips/voyagergx/

0
arch/sh/mach-cayman/Makefile → arch/sh/boards/cayman/Makefile
View file

0
arch/sh/mach-cayman/irq.c → arch/sh/boards/cayman/irq.c
View file

0
arch/sh/mach-cayman/led.c → arch/sh/boards/cayman/led.c
View file

0
arch/sh/mach-cayman/setup.c → arch/sh/boards/cayman/setup.c
View file

1
arch/sh/kernel/time_64.c
View file

@ -353,7 +353,6 @@ static __init unsigned int get_cpu_hz(void)
* wrap-around (128) and CUI interrupt being raised (64). * wrap-around (128) and CUI interrupt being raised (64).
*/ */
return count*2; return count*2;
#endif
} }
static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id) static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id)

1
arch/sh/tools/mach-types
View file

@ -45,3 +45,4 @@ X3PROTO SH_X3PROTO
MAGICPANELR2 SH_MAGIC_PANEL_R2 MAGICPANELR2 SH_MAGIC_PANEL_R2
R2D_PLUS RTS7751R2D_PLUS R2D_PLUS RTS7751R2D_PLUS
R2D_1 RTS7751R2D_1 R2D_1 RTS7751R2D_1
CAYMAN SH_CAYMAN