patch-1.3.33 linux/drivers/char/lp.c

• Lines: 38
• Date: Tue Oct 10 10:42:01 1995
• Orig file: v1.3.32/linux/drivers/char/lp.c
• Orig date: Mon Sep 18 14:53:53 1995

diff -u --recursive --new-file v1.3.32/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -559,22 +559,17 @@
 char kernel_version[]=UTS_RELEASE;
 int io[] = {0, 0, 0};
 int irq[] = {0, 0, 0};
-
-int init_module(void)
-#else
-long lp_init(long kmem_start)
+#define lp_init init_module
 #endif
+
+int lp_init(void)
 {
 	int offset = 0;
 	int count = 0;
 
 	if (register_chrdev(LP_MAJOR,"lp",&lp_fops)) {
 		printk("lp: unable to get major %d\n", LP_MAJOR);
-#ifdef MODULE
 		return -EIO;
-#else
-		return kmem_start;
-#endif
 	}
 #ifdef MODULE
 	/* When user feeds parameters, use them */
@@ -610,11 +605,7 @@
 	if (count == 0)
 		printk("lp: Driver configured but no interfaces found.\n");
 
-#ifdef MODULE
 	return 0;
-#else
-	return kmem_start;
-#endif
 }
 
 #ifdef MODULE