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

Commit 2727eac6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-ethernet-Miscellaneous-Kconfig-and-Makefile-cleanups' 



Geert Uytterhoeven says:

====================
net: ethernet: Miscellaneous Kconfig and Makefile cleanups

This patch series contains a few Kconfig and Makefile cleanups w.r.t.
Ethernet vendors.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e15268e eec8bb13

drivers/net/ethernet/Makefile

+3 −4
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/
@@ -80,8 +80,7 @@ obj-$(CONFIG_NET_VENDOR_SAMSUNG) += samsung/ 
obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/

obj-$(CONFIG_NET_VENDOR_SILAN) += silan/

obj-$(CONFIG_NET_VENDOR_SIS) += sis/

obj-$(CONFIG_SFC) += sfc/

obj-$(CONFIG_SFC_FALCON) += sfc/falcon/

obj-$(CONFIG_NET_VENDOR_SOLARFLARE) += sfc/

obj-$(CONFIG_NET_VENDOR_SGI) += sgi/

obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/

obj-$(CONFIG_NET_VENDOR_SOCIONEXT) += socionext/

drivers/net/ethernet/aurora/Kconfig

+1 −0
Original line number Diff line number Diff line 
config NET_VENDOR_AURORA

	bool "Aurora VLSI devices"

	default y

	help

	  If you have a network (Ethernet) device belonging to this class,

	  say Y.

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

drivers/net/ethernet/sfc/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,3 +6,5 @@ sfc-$(CONFIG_SFC_MTD) += mtd.o 
sfc-$(CONFIG_SFC_SRIOV)	+= sriov.o siena_sriov.o ef10_sriov.o



obj-$(CONFIG_SFC)	+= sfc.o



obj-$(CONFIG_SFC_FALCON) += falcon/