Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / mips / vr41xx / nec-cmbvr4133 / setup.c

diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index b2ffa1d..53272a5 100644 (file)
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -16,7 +16,6 @@
  */
 #include <linux/config.h>
 #include <linux/init.h>
-#include <linux/console.h>
 #include <linux/ide.h>
 #include <linux/ioport.h>
 
@@ -55,18 +54,9 @@ static struct mtd_partition cmbvr4133_mtd_parts[] = {
 #define number_partitions (sizeof(cmbvr4133_mtd_parts)/sizeof(struct mtd_partition))
 #endif
 
-extern void (*late_time_init)(void);
-
-static void __init vr4133_serial_init(void)
-{
-       vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
-       vr41xx_siu_init();
-       vr41xx_dsiu_init();
-}
-
 extern void i8259_init(void);
 
-static int __init nec_cmbvr4133_setup(void)
+static void __init nec_cmbvr4133_setup(void)
 {
 #ifdef CONFIG_ROCKHOPPER
        extern void disable_pcnet(void);
@@ -78,8 +68,6 @@ static int __init nec_cmbvr4133_setup(void)
        mips_machgroup = MACH_GROUP_NEC_VR41XX;
        mips_machtype = MACH_NEC_CMBVR4133;
 
-       late_time_init = vr4133_serial_init;
-
 #ifdef CONFIG_PCI
 #ifdef CONFIG_ROCKHOPPER
        ali_m5229_preinit();
@@ -102,7 +90,4 @@ static int __init nec_cmbvr4133_setup(void)
 #ifdef CONFIG_ROCKHOPPER
        i8259_init();
 #endif
-       return 0;
 }
-
-early_initcall(nec_cmbvr4133_setup);