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

Next file: linux/drivers/char/Config.in
Previous file: linux/drivers/block/acsi_slm.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.47/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -907,14 +907,14 @@
 __initfunc(void device_setup(void))
 {
 	extern void console_map_init(void);
-#ifdef CONFIG_PNP_PARPORT
-	extern int pnp_parport_init(void);
+#ifdef CONFIG_PARPORT
+	extern int parport_init(void);
 #endif
 	struct gendisk *p;
 	int nr=0;
 
-#ifdef CONFIG_PNP_PARPORT
-	pnp_parport_init();
+#ifdef CONFIG_PARPORT
+	parport_init();
 #endif
 	chr_dev_init();
 	blk_dev_init();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov