patch-2.2.14 linux/drivers/net/arcnet.c

Next file: linux/drivers/net/arlan-proc.c
Previous file: linux/drivers/net/Space.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.13/linux/drivers/net/arcnet.c linux/drivers/net/arcnet.c
@@ -469,7 +469,7 @@
   register_netdevice(lp->edev);
 #endif
 
-#ifdef CONFIG_ARCNET_1051
+#if defined(CONFIG_ARCNET_1051) && defined(CONFIG_ARCNET_ETH)
   /* Initialize the RFC1051-encap protocol driver */
   lp->sdev=(struct device *)kmalloc(sizeof(struct device)+10,GFP_KERNEL);
   if(lp->sdev == NULL)

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