patch-2.1.34 linux/drivers/pnp/parport_init.c

Next file: linux/drivers/pnp/parport_probe.c
Previous file: linux/drivers/net/sunqe.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.33/linux/drivers/pnp/parport_init.c linux/drivers/pnp/parport_init.c
@@ -9,10 +9,12 @@
  *              and Philip Blundell <Philip.Blundell@pobox.com>
  */
 
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/tasks.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 
-#include <linux/module.h>
 #include <linux/parport.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -761,8 +763,10 @@
 #undef PORT
 	}
 
+#ifdef CONFIG_PNP_PARPORT_AUTOPROBE
 	for (pb = parport_enumerate(); pb; pb = pb->next)
 		parport_probe_one(pb);
+#endif
 
 	return 0;
 }

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