patch-1.3.47 linux/kernel/ksyms.c

Next file: linux/mm/filemap.c
Previous file: linux/ipc/shm.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.46/linux/kernel/ksyms.c linux/kernel/ksyms.c
@@ -76,6 +76,9 @@
 #include "../drivers/net/slhc.h"
 #endif
 #endif
+#ifdef CONFIG_NET_ALIAS
+#include <linux/net_alias.h>
+#endif
 #endif
 #ifdef CONFIG_PCI
 #include <linux/bios32.h>
@@ -412,6 +415,10 @@
 	/* Device callback registration */
 	X(register_netdevice_notifier),
 	X(unregister_netdevice_notifier),
+#ifdef CONFIG_NET_ALIAS
+	X(register_net_alias_type),
+	X(unregister_net_alias_type),
+#endif
 #endif
 
 	/* support for loadable net drivers */
@@ -452,11 +459,7 @@
  	 * So we add it here too.  There is a duplicate set in scsi.c
  	 * that is used when the entire scsi subsystem is a loadable
  	 * module.
-    	 * 
- 	 * in_scan_scsis is a hack, and should go away once the new 
-	 * memory allocation code is in the NCR driver 
 	 */
-    	X(in_scan_scsis),
 	X(scsi_register_module),
 	X(scsi_unregister_module),
 	X(scsi_free),

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this