[linuxsh-cvs] CVS: linux/arch/sh/boards/sh03 setup.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/arch/sh/boards/sh03
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6166/arch/sh/boards/sh03

Modified Files:
	setup.c 
Log Message:
Some more machvec overhauling and setup code cleanup. Kill off
get_system_type() and platform_setup(), we can do these both through the
machvec. While we're add it, kill off more useless mach.c's and drop some
legacy cruft from setup.c.



Index: setup.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/sh03/setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setup.c	5 Feb 2006 21:55:29 -0000	1.3
+++ setup.c	7 Aug 2006 06:27:26 -0000	1.4
@@ -14,12 +14,7 @@
 #include <asm/sh03/sh03.h>
 #include <asm/addrspace.h>
 
-const char *get_system_type(void)
-{
-	return "Interface (CTP/PCI-SH03)";
-}
-
-static void init_sh03_IRQ(void)
+static void __init init_sh03_IRQ(void)
 {
 	ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
 
@@ -42,7 +37,17 @@
         return (void __iomem *)(port + PCI_IO_BASE);
 }
 
+/* arch/sh/boards/sh03/rtc.c */
+void sh03_time_init(void);
+
+static void __init sh03_setup(char **cmdline_p)
+{
+	board_time_init = sh03_time_init;
+}
+
 struct sh_machine_vector mv_sh03 __initmv = {
+	.mv_name		= "Interface (CTP/PCI-SH03)",
+	.mv_setup		= sh03_setup,
 	.mv_nr_irqs		= 48,
 	.mv_ioport_map		= sh03_ioport_map,
 	.mv_init_irq		= init_sh03_IRQ,
@@ -52,12 +57,3 @@
 #endif
 };
 ALIAS_MV(sh03)
-
-/* arch/sh/boards/sh03/rtc.c */
-void sh03_time_init(void);
-
-int __init platform_setup(void)
-{
-	board_time_init = sh03_time_init;
-	return 0;
-}