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

Commit 0df5f81c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

net: ethernet: Add missing VENDOR to Cadence and Packet Engines symbols 



The vendor guard Kconfig symbols for Cadence and Packet Engines use a
"NET_" prefix, while all other vendor guards use a "NET_VENDOR_"
prefix.  Hence make them consistent with the rest, and add the missing
trailing "S" for Packet Engines while at it.

As these options don't directly affect the kernel build, and default to
"y", this change has no impact on kernels built with existing
(def)configs.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 118e9690

drivers/net/ethernet/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/ 
obj-$(CONFIG_NET_VENDOR_ARC) += arc/

obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/

obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/

obj-$(CONFIG_NET_CADENCE) += cadence/

obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/

obj-$(CONFIG_NET_CALXEDA_XGMAC) += calxeda/
@@ -68,7 +68,7 @@ obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/ 
obj-$(CONFIG_LPC_ENET) += nxp/

obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/

obj-$(CONFIG_ETHOC) += ethoc.o

obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/

obj-$(CONFIG_NET_VENDOR_PACKET_ENGINES) += packetengines/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/

drivers/net/ethernet/cadence/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Atmel device configuration

#



config NET_CADENCE

config NET_VENDOR_CADENCE

	bool "Cadence devices"

	depends on HAS_IOMEM

	default y
@@ -16,7 +16,7 @@ config NET_CADENCE 
	  the remaining Atmel network card questions. If you say Y, you will be

	  asked for your specific card in the following questions.



if NET_CADENCE

if NET_VENDOR_CADENCE



config MACB

	tristate "Cadence MACB/GEM support"
@@ -48,4 +48,4 @@ config MACB_PCI 
	  To compile this driver as a module, choose M here: the module

	  will be called macb_pci.



endif # NET_CADENCE
 
endif # NET_VENDOR_CADENCE

drivers/net/ethernet/packetengines/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Packet engine device configuration

#



config NET_PACKET_ENGINE

config NET_VENDOR_PACKET_ENGINES

	bool "Packet Engine devices"

	default y

	depends on PCI
@@ -14,7 +14,7 @@ config NET_PACKET_ENGINE 
	  the questions about packet engine devices. If you say Y, you will

	  be asked for your specific card in the following questions.



if NET_PACKET_ENGINE

if NET_VENDOR_PACKET_ENGINES



config HAMACHI

	tristate "Packet Engines Hamachi GNIC-II support"
@@ -40,4 +40,4 @@ config YELLOWFIN 
	  To compile this driver as a module, choose M here: the module

	  will be called yellowfin.  This is recommended.



endif # NET_PACKET_ENGINE
 
endif # NET_VENDOR_PACKET_ENGINES