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

Commit 433aee04 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller
Browse files

i825xx:xscale:8390:freescale: Fix Kconfig dependancies 



i825xx and xscale are "sub" Kconfigs to NET_VENDOR_INTEL, so
NET_VENDOR_INTEL should contain ALL the dependencies of the
"sub" Kconfigs.

Same with 8390 is a "sub" Kconfig to NET_VENDOR_NATSEMI, so
NET_VENDOR_NATSEMI needs to contains ALL the dependencies.

Freescale Kconfig only had fs_enet as a sub Kconfig, and already
contained the needed dependencies, just cleaned up the dependencies.

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 729e72a1

drivers/net/ethernet/freescale/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ config NET_VENDOR_FREESCALE 
	default y

	depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \

		   M523x || M527x || M5272 || M528x || M520x || M532x || \

		   ARCH_MXC || ARCH_MXS || \

		   (PPC_MPC52xx && PPC_BESTCOMM)

		   ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM)

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from

drivers/net/ethernet/intel/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ 
config NET_VENDOR_INTEL

	bool "Intel devices"

	default y

	depends on PCI || PCI_MSI

	depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \

		   ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \

		   GSC || BVME6000 || MVME16x || ARCH_ENP2611 || \

		   (ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \

		   EXPERIMENTAL

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from

drivers/net/ethernet/natsemi/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ 
config NET_VENDOR_NATSEMI

	bool "National Semi-conductor devices"

	default y

	depends on MCA || MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000

	depends on AMIGA_PCMCIA || ARM || EISA || EXPERIMENTAL || H8300 || \

		   ISA || M32R || MAC || MACH_JAZZ || MACH_TX49XX || MCA || \

		   MCA_LEGACY || MIPS || PCI || PCMCIA || SUPERH || \

		   XTENSA_PLATFORM_XT2000 || ZORRO

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from