patch-2.1.130 linux/drivers/char/mem.c

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

diff -u --recursive --new-file v2.1.129/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -512,7 +512,7 @@
 		case 3:
 			filp->f_op = &null_fops;
 			break;
-#ifndef CONFIG_PPC
+#if !defined(CONFIG_PPC) && !defined(__mc68000__)
 		case 4:
 			filp->f_op = &port_fops;
 			break;
@@ -568,6 +568,9 @@
 	tty_init();
 #ifdef CONFIG_PRINTER
 	lp_init();
+#endif
+#ifdef CONFIG_M68K_PRINTER
+	lp_m68k_init();
 #endif
 	misc_init();
 #ifdef CONFIG_SOUND

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