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

Commit ee621dd6 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

net: atmel_macb Kconfig: remove long dependency line 



Many Atmel SOC are embedding a MACB controller. This patch removes the long
dependency line for this Atmel MACB ethernet driver configuration entry.
The HAVE_NET_MACB configuration option is located in the net Kconfig file
as it may be setup by ARM/AT91 and AVR32 chips.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: David Miller <davem@davemloft.net>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
parent cb809b1a

arch/arm/mach-at91/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ config ARCH_AT91SAM9260 
	select HAVE_AT91_USART3

	select HAVE_AT91_USART3

	select HAVE_AT91_USART4

	select HAVE_AT91_USART4

	select HAVE_AT91_USART5

	select HAVE_AT91_USART5

	select HAVE_NET_MACB





config ARCH_AT91SAM9261

config ARCH_AT91SAM9261

	bool "AT91SAM9261"

	bool "AT91SAM9261"
@@ -51,6 +52,7 @@ config ARCH_AT91SAM9263 
	select CPU_ARM926T

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB





config ARCH_AT91SAM9RL

config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	bool "AT91SAM9RL"
@@ -66,6 +68,7 @@ config ARCH_AT91SAM9G20 
	select HAVE_AT91_USART3

	select HAVE_AT91_USART3

	select HAVE_AT91_USART4

	select HAVE_AT91_USART4

	select HAVE_AT91_USART5

	select HAVE_AT91_USART5

	select HAVE_NET_MACB





config ARCH_AT91SAM9G45

config ARCH_AT91SAM9G45

	bool "AT91SAM9G45"

	bool "AT91SAM9G45"
@@ -73,6 +76,7 @@ config ARCH_AT91SAM9G45 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3

	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB





config ARCH_AT91CAP9

config ARCH_AT91CAP9

	bool "AT91CAP9"

	bool "AT91CAP9"

arch/avr32/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ config PLATFORM_AT32AP 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_ALLOCATOR

	select GENERIC_ALLOCATOR

	select HAVE_FB_ATMEL

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB





#

#

# CPU types

# CPU types

drivers/net/Kconfig

+4 −1
Original line number Original line Diff line number Diff line
@@ -2,6 +2,9 @@ 
# Network device configuration

# Network device configuration

#

#





config HAVE_NET_MACB

	bool



menuconfig NETDEVICES

menuconfig NETDEVICES

	default y if UML

	default y if UML

	depends on NET

	depends on NET
@@ -221,7 +224,7 @@ config MII 




config MACB

config MACB

	tristate "Atmel MACB support"

	tristate "Atmel MACB support"

	depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9

	depends on HAVE_NET_MACB

	select PHYLIB

	select PHYLIB

	help

	help

	  The Atmel MACB ethernet interface is found on many AT32 and AT91

	  The Atmel MACB ethernet interface is found on many AT32 and AT91