patch-2.1.48 linux/init/main.c

Next file: linux/kernel/exit.c
Previous file: linux/include/linux/sysrq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.47/linux/init/main.c linux/init/main.c
@@ -215,7 +215,7 @@
 #ifdef CONFIG_WDT
 extern void wdt_setup(char *str, int *ints);
 #endif
-#ifdef CONFIG_PNP_PARPORT
+#ifdef CONFIG_PARPORT
 extern void parport_setup(char *str, int *ints);
 #endif
 #ifdef CONFIG_PLIP
@@ -511,7 +511,7 @@
 #ifdef CONFIG_WDT
 	{ "wdt=", wdt_setup },
 #endif
-#ifdef CONFIG_PNP_PARPORT
+#ifdef CONFIG_PARPORT
 	{ "parport=", parport_setup },
 #endif
 #ifdef CONFIG_PLIP

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