---

yaml --- r: 221659 b: refs/heads/master c: f6eec8d h: refs/heads/master i: 221657: 4781618 221655: f206f88 v: v3
git-mirror · Oct 29, 2010 · 9993791 · 9993791
1 parent 8619651
commit 9993791
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39c11984a4f36bd1ce7f90f7506824955f0f4863
+refs/heads/master: f6eec8d66400714e47add3d8341688a1e86c5de9
diff --git a/trunk/arch/sh/Makefile b/trunk/arch/sh/Makefile
@@ -133,7 +133,6 @@ machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se
 machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx
 machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast
 machdir-$(CONFIG_SH_SH03)			+= mach-sh03
-machdir-$(CONFIG_SH_SECUREEDGE5410)		+= mach-snapgear
 machdir-$(CONFIG_SH_RTS7751R2D)			+= mach-r2d
 machdir-$(CONFIG_SH_7751_SYSTEMH)		+= mach-systemh
 machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705

diff --git a/trunk/arch/sh/boards/Makefile b/trunk/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/trunk/arch/sh/boards/mach-snapgear/setup.c → trunk/arch/sh/boards/board-secureedge5410.c b/trunk/arch/sh/boards/mach-snapgear/setup.c → trunk/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/trunk/arch/sh/boards/mach-snapgear/Makefile b/trunk/arch/sh/boards/mach-snapgear/Makefile
diff --git a/trunk/arch/sh/configs/snapgear_defconfig → .../arch/sh/configs/secureedge5410_defconfig b/trunk/arch/sh/configs/snapgear_defconfig → .../arch/sh/configs/secureedge5410_defconfig
diff --git a/...ch/sh/include/mach-common/mach/snapgear.h → ...include/mach-common/mach/secureedge5410.h b/...ch/sh/include/mach-common/mach/snapgear.h → ...include/mach-common/mach/secureedge5410.h
diff --git a/trunk/drivers/rtc/rtc-ds1302.c b/trunk/drivers/rtc/rtc-ds1302.c
@@ -35,7 +35,7 @@
 
 #ifdef CONFIG_SH_SECUREEDGE5410
 #include <asm/rtc.h>
-#include <mach/snapgear.h>
+#include <mach/secureedge5410.h>
 
 #define	RTC_RESET	0x1000
 #define	RTC_IODATA	0x0800