patch-2.4.5 linux/drivers/block/genhd.c

• Lines: 31
• Date: Wed May 16 14:01:32 2001
• Orig file: v2.4.4/linux/drivers/block/genhd.c
• Orig date: Sun Sep 17 23:16:35 2000

diff -u --recursive --new-file v2.4.4/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -17,8 +17,6 @@
 #include <linux/blk.h>
 #include <linux/init.h>
 
-extern int parport_init(void);
-extern int chr_dev_init(void);
 extern int blk_dev_init(void);
 #ifdef CONFIG_BLK_DEV_DAC960
 extern void DAC960_Initialize(void);
@@ -31,12 +29,8 @@
 extern int cpqarray_init(void);
 extern void ieee1394_init(void);
 
-void __init device_init(void)
+int __init device_init(void)
 {
-#ifdef CONFIG_PARPORT
-	parport_init();
-#endif
-	chr_dev_init();
 	blk_dev_init();
 	sti();
 #ifdef CONFIG_I2O
@@ -64,4 +58,7 @@
 #ifdef CONFIG_VT
 	console_map_init();
 #endif
+	return 0;
 }
+
+__initcall(device_init);