CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/07/07 22:44:25

Modified files:
        arch/mips/cobalt: setup.c 
        arch/mips/momentum/jaguar_atx: setup.c 
        arch/mips/momentum/ocelot_3: setup.c 
        arch/mips/momentum/ocelot_g: setup.c 
        arch/mips/sgi-ip27: ip27-init.c 
        arch/mips/sibyte/swarm: setup.c 

Log message:
        Fix plat_setup inconsistencies.

diff -urN linux/arch/mips/cobalt/setup.c linux/arch/mips/cobalt/setup.c
--- linux/arch/mips/cobalt/setup.c      2005/06/21 13:56:30     1.25
+++ linux/arch/mips/cobalt/setup.c      2005/07/07 21:44:24     1.26
@@ -91,7 +91,7 @@
        .io_offset      = 0 - GT64111_IO_BASE
 };
 
-int __init plat_setup(void)
+void __init plat_setup(void)
 {
        static struct uart_port uart;
        unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);
diff -urN linux/arch/mips/momentum/jaguar_atx/setup.c 
linux/arch/mips/momentum/jaguar_atx/setup.c
--- linux/arch/mips/momentum/jaguar_atx/setup.c 2005/06/21 13:56:31     1.15
+++ linux/arch/mips/momentum/jaguar_atx/setup.c 2005/07/07 21:44:24     1.16
@@ -351,7 +351,7 @@
 
 arch_initcall(ja_pci_init);
 
-int  __init plat_setup(void)
+void __init plat_setup(void)
 {
        unsigned int tmpword;
 
diff -urN linux/arch/mips/momentum/ocelot_3/setup.c 
linux/arch/mips/momentum/ocelot_3/setup.c
--- linux/arch/mips/momentum/ocelot_3/setup.c   2005/06/21 13:56:31     1.4
+++ linux/arch/mips/momentum/ocelot_3/setup.c   2005/07/07 21:44:24     1.5
@@ -307,7 +307,7 @@
 
 arch_initcall(ja_pci_init);
 
-int __init plat_setup(void)
+void __init plat_setup(void)
 {
        unsigned int tmpword;
 
diff -urN linux/arch/mips/momentum/ocelot_g/setup.c 
linux/arch/mips/momentum/ocelot_g/setup.c
--- linux/arch/mips/momentum/ocelot_g/setup.c   2005/06/21 13:56:31     1.19
+++ linux/arch/mips/momentum/ocelot_g/setup.c   2005/07/07 21:44:24     1.20
@@ -160,7 +160,7 @@
        printk("Done\n");
 }
 
-int  __init plat_setup(void)
+void __init plat_setup(void)
 {
        void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);
        unsigned int tmpword;
diff -urN linux/arch/mips/sgi-ip27/ip27-init.c 
linux/arch/mips/sgi-ip27/ip27-init.c
--- linux/arch/mips/sgi-ip27/ip27-init.c        2005/06/21 13:56:32     1.69
+++ linux/arch/mips/sgi-ip27/ip27-init.c        2005/07/07 21:44:24     1.70
@@ -243,6 +243,4 @@
        set_io_port_base(IO_BASE);
 
        board_time_init = ip27_time_init;
-
-       return 0;
 }
diff -urN linux/arch/mips/sibyte/swarm/setup.c 
linux/arch/mips/sibyte/swarm/setup.c
--- linux/arch/mips/sibyte/swarm/setup.c        2005/06/21 13:56:32     1.35
+++ linux/arch/mips/sibyte/swarm/setup.c        2005/07/07 21:44:25     1.36
@@ -84,7 +84,7 @@
        return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
 }
 
-int __init plat_setup(void)
+void __init plat_setup(void)
 {
        sb1250_setup();