diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-08-08 00:21:33 -0400 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2010-10-07 13:56:55 -0400 |
| commit | ee621dd619b9a85eced150fc06e352fef54cfda0 (patch) | |
| tree | 7aa5877e7ecae0f41c39f10e70221f4ca4857fb1 | |
| parent | cb809b1a5ebffca8cf0314b788919989e8e4ab5f (diff) | |
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: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: David Miller <davem@davemloft.net>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 4 | ||||
| -rw-r--r-- | arch/avr32/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 23bf5c2c0fab..bbd5efa65099 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -33,6 +33,7 @@ config ARCH_AT91SAM9260 | |||
| 33 | select HAVE_AT91_USART3 | 33 | select HAVE_AT91_USART3 |
| 34 | select HAVE_AT91_USART4 | 34 | select HAVE_AT91_USART4 |
| 35 | select HAVE_AT91_USART5 | 35 | select HAVE_AT91_USART5 |
| 36 | select HAVE_NET_MACB | ||
| 36 | 37 | ||
| 37 | config ARCH_AT91SAM9261 | 38 | config ARCH_AT91SAM9261 |
| 38 | bool "AT91SAM9261" | 39 | bool "AT91SAM9261" |
| @@ -51,6 +52,7 @@ config ARCH_AT91SAM9263 | |||
| 51 | select CPU_ARM926T | 52 | select CPU_ARM926T |
| 52 | select GENERIC_CLOCKEVENTS | 53 | select GENERIC_CLOCKEVENTS |
| 53 | select HAVE_FB_ATMEL | 54 | select HAVE_FB_ATMEL |
| 55 | select HAVE_NET_MACB | ||
| 54 | 56 | ||
| 55 | config ARCH_AT91SAM9RL | 57 | config ARCH_AT91SAM9RL |
| 56 | bool "AT91SAM9RL" | 58 | bool "AT91SAM9RL" |
| @@ -66,6 +68,7 @@ config ARCH_AT91SAM9G20 | |||
| 66 | select HAVE_AT91_USART3 | 68 | select HAVE_AT91_USART3 |
| 67 | select HAVE_AT91_USART4 | 69 | select HAVE_AT91_USART4 |
| 68 | select HAVE_AT91_USART5 | 70 | select HAVE_AT91_USART5 |
| 71 | select HAVE_NET_MACB | ||
| 69 | 72 | ||
| 70 | config ARCH_AT91SAM9G45 | 73 | config ARCH_AT91SAM9G45 |
| 71 | bool "AT91SAM9G45" | 74 | bool "AT91SAM9G45" |
| @@ -73,6 +76,7 @@ config ARCH_AT91SAM9G45 | |||
| 73 | select GENERIC_CLOCKEVENTS | 76 | select GENERIC_CLOCKEVENTS |
| 74 | select HAVE_AT91_USART3 | 77 | select HAVE_AT91_USART3 |
| 75 | select HAVE_FB_ATMEL | 78 | select HAVE_FB_ATMEL |
| 79 | select HAVE_NET_MACB | ||
| 76 | 80 | ||
| 77 | config ARCH_AT91CAP9 | 81 | config ARCH_AT91CAP9 |
| 78 | bool "AT91CAP9" | 82 | bool "AT91CAP9" |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index f51572772e21..9ac87255a03a 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
| @@ -90,6 +90,7 @@ config PLATFORM_AT32AP | |||
| 90 | select ARCH_REQUIRE_GPIOLIB | 90 | select ARCH_REQUIRE_GPIOLIB |
| 91 | select GENERIC_ALLOCATOR | 91 | select GENERIC_ALLOCATOR |
| 92 | select HAVE_FB_ATMEL | 92 | select HAVE_FB_ATMEL |
| 93 | select HAVE_NET_MACB | ||
| 93 | 94 | ||
| 94 | # | 95 | # |
| 95 | # CPU types | 96 | # CPU types |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2cc81a54cbf3..1c767ade7ef8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2,6 +2,9 @@ | |||
| 2 | # Network device configuration | 2 | # Network device configuration |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | config HAVE_NET_MACB | ||
| 6 | bool | ||
| 7 | |||
| 5 | menuconfig NETDEVICES | 8 | menuconfig NETDEVICES |
| 6 | default y if UML | 9 | default y if UML |
| 7 | depends on NET | 10 | depends on NET |
| @@ -221,7 +224,7 @@ config MII | |||
| 221 | 224 | ||
| 222 | config MACB | 225 | config MACB |
| 223 | tristate "Atmel MACB support" | 226 | tristate "Atmel MACB support" |
| 224 | depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 | 227 | depends on HAVE_NET_MACB |
| 225 | select PHYLIB | 228 | select PHYLIB |
| 226 | help | 229 | help |
| 227 | The Atmel MACB ethernet interface is found on many AT32 and AT91 | 230 | The Atmel MACB ethernet interface is found on many AT32 and AT91 |
