patch-2.2.0-pre8 linux/drivers/char/lp_m68k.c

Next file: linux/drivers/char/misc.c
Previous file: linux/drivers/char/i2c.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre7/linux/drivers/char/lp_m68k.c linux/drivers/char/lp_m68k.c
@@ -43,9 +43,7 @@
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/init.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #ifdef CONFIG_AMIGA
 #ifdef CONFIG_MULTIFACE_III_LP
@@ -374,14 +372,12 @@
 	if (dev >= MAX_LP)
 		goto out_err;
 
-#ifdef CONFIG_KMOD
 	if (!lp_table[dev]) {
 		char modname[30];
 
 		sprintf(modname, "char-major-%d-%d", LP_MAJOR, dev);
 		request_module(modname);
 	}
-#endif
 	if (!lp_table[dev])
 		goto out_err;
 	if (!(lp_table[dev]->flags & LP_EXIST))

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