patch-2.3.27 linux/drivers/net/wan/x25_asy.c

Next file: linux/drivers/net/yellowfin.c
Previous file: linux/drivers/net/wan/sdla.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.26/linux/drivers/net/wan/x25_asy.c linux/drivers/net/wan/x25_asy.c
@@ -813,11 +813,8 @@
 }
 
 /* Initialize X.25 control device -- register X.25 line discipline */
-#ifdef MODULE
-static int x25_asy_init_ctrl_dev(void)
-#else	/* !MODULE */
-int __init x25_asy_init_ctrl_dev(struct net_device *dummy)
-#endif	/* !MODULE */
+
+int __init x25_asy_init_ctrl_dev(void)
 {
 	int status;
 
@@ -854,15 +851,8 @@
 		printk("X.25 async: can't register line discipline (err = %d)\n", status);
 	}
 
-#ifdef MODULE
 	return status;
-#else
-	/* Return "not found", so that dev_init() will unlink
-	 * the placeholder device entry for us.
-	 */
-	return ENODEV;
-#endif
-      }
+}
 
 
 /* Initialise the X.25 driver.  Called by the device init code */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)