Browse Source

net: Fix references to deleted NET_ETHERNET Kconfig setting.

Change them over to plain "ETHERNET"

Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
David S. Miller 13 years ago
parent
commit
1e49570171

+ 1 - 1
arch/cris/arch-v10/drivers/Kconfig

@@ -3,7 +3,7 @@ if ETRAX_ARCH_V10
 config ETRAX_ETHERNET
 config ETRAX_ETHERNET
 	bool "Ethernet support"
 	bool "Ethernet support"
 	depends on ETRAX_ARCH_V10
 	depends on ETRAX_ARCH_V10
-	select NET_ETHERNET
+	select ETHERNET
 	select NET_CORE
 	select NET_CORE
 	select MII
 	select MII
 	help
 	help

+ 1 - 1
arch/cris/arch-v32/drivers/Kconfig

@@ -3,7 +3,7 @@ if ETRAX_ARCH_V32
 config ETRAX_ETHERNET
 config ETRAX_ETHERNET
 	bool "Ethernet support"
 	bool "Ethernet support"
 	depends on ETRAX_ARCH_V32
 	depends on ETRAX_ARCH_V32
-	select NET_ETHERNET
+	select ETHERNET
 	select NET_CORE
 	select NET_CORE
 	select MII
 	select MII
 	help
 	help

+ 1 - 1
drivers/s390/net/Kconfig

@@ -4,7 +4,7 @@ menu "S/390 network device drivers"
 config LCS
 config LCS
 	def_tristate m
 	def_tristate m
 	prompt "Lan Channel Station Interface"
 	prompt "Lan Channel Station Interface"
-	depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
+	depends on CCW && NETDEVICES && (ETHERNET || TR || FDDI)
 	help
 	help
 	   Select this option if you want to use LCS networking on IBM System z.
 	   Select this option if you want to use LCS networking on IBM System z.
 	   This device driver supports Token Ring (IEEE 802.5),
 	   This device driver supports Token Ring (IEEE 802.5),

+ 3 - 3
drivers/s390/net/lcs.c

@@ -50,7 +50,7 @@
 #include "lcs.h"
 #include "lcs.h"
 
 
 
 
-#if !defined(CONFIG_NET_ETHERNET) && \
+#if !defined(CONFIG_ETHERNET) && \
     !defined(CONFIG_TR) && !defined(CONFIG_FDDI)
     !defined(CONFIG_TR) && !defined(CONFIG_FDDI)
 #error Cannot compile lcs.c without some net devices switched on.
 #error Cannot compile lcs.c without some net devices switched on.
 #endif
 #endif
@@ -1634,7 +1634,7 @@ lcs_startlan_auto(struct lcs_card *card)
 	int rc;
 	int rc;
 
 
 	LCS_DBF_TEXT(2, trace, "strtauto");
 	LCS_DBF_TEXT(2, trace, "strtauto");
-#ifdef CONFIG_NET_ETHERNET
+#ifdef CONFIG_ETHERNET
 	card->lan_type = LCS_FRAME_TYPE_ENET;
 	card->lan_type = LCS_FRAME_TYPE_ENET;
 	rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
 	rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
 	if (rc == 0)
 	if (rc == 0)
@@ -2166,7 +2166,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
 		goto netdev_out;
 		goto netdev_out;
 	}
 	}
 	switch (card->lan_type) {
 	switch (card->lan_type) {
-#ifdef CONFIG_NET_ETHERNET
+#ifdef CONFIG_ETHERNET
 	case LCS_FRAME_TYPE_ENET:
 	case LCS_FRAME_TYPE_ENET:
 		card->lan_type_trans = eth_type_trans;
 		card->lan_type_trans = eth_type_trans;
 		dev = alloc_etherdev(0);
 		dev = alloc_etherdev(0);