Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e495701 authored by David S. Miller's avatar David S. Miller
Browse files

net: Fix references to deleted NET_ETHERNET Kconfig setting. 



Change them over to plain "ETHERNET"

Reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3b971a7c

arch/cris/arch-v10/drivers/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/cris/arch-v32/drivers/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/s390/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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),

drivers/s390/net/lcs.c

+3 −3
Original line number Diff line number Diff line
@@ -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
@@ -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)
@@ -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);