Skip to content

Commit

Permalink
net: Fix references to deleted NET_ETHERNET Kconfig setting.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Nov 10, 2011
1 parent 3b971a7 commit 1e49570
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/cris/arch-v10/drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if ETRAX_ARCH_V10
config ETRAX_ETHERNET
bool "Ethernet support"
depends on ETRAX_ARCH_V10
select NET_ETHERNET
select ETHERNET
select NET_CORE
select MII
help
Expand Down
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if ETRAX_ARCH_V32
config ETRAX_ETHERNET
bool "Ethernet support"
depends on ETRAX_ARCH_V32
select NET_ETHERNET
select ETHERNET
select NET_CORE
select MII
help
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ menu "S/390 network device drivers"
config LCS
def_tristate m
prompt "Lan Channel Station Interface"
depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
depends on CCW && NETDEVICES && (ETHERNET || TR || FDDI)
help
Select this option if you want to use LCS networking on IBM System z.
This device driver supports Token Ring (IEEE 802.5),
Expand Down
6 changes: 3 additions & 3 deletions drivers/s390/net/lcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "lcs.h"


#if !defined(CONFIG_NET_ETHERNET) && \
#if !defined(CONFIG_ETHERNET) && \
!defined(CONFIG_TR) && !defined(CONFIG_FDDI)
#error Cannot compile lcs.c without some net devices switched on.
#endif
Expand Down Expand Up @@ -1634,7 +1634,7 @@ lcs_startlan_auto(struct lcs_card *card)
int rc;

LCS_DBF_TEXT(2, trace, "strtauto");
#ifdef CONFIG_NET_ETHERNET
#ifdef CONFIG_ETHERNET
card->lan_type = LCS_FRAME_TYPE_ENET;
rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP);
if (rc == 0)
Expand Down Expand Up @@ -2166,7 +2166,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
goto netdev_out;
}
switch (card->lan_type) {
#ifdef CONFIG_NET_ETHERNET
#ifdef CONFIG_ETHERNET
case LCS_FRAME_TYPE_ENET:
card->lan_type_trans = eth_type_trans;
dev = alloc_etherdev(0);
Expand Down

0 comments on commit 1e49570

Please sign in to comment.