diff options
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 4 | ||||
-rw-r--r-- | arch/avr32/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/cadence/Kconfig | 5 |
3 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index b14207101938..682abf13d0f4 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -45,7 +45,6 @@ config SOC_AT91RM9200 | |||
45 | config SOC_AT91SAM9260 | 45 | config SOC_AT91SAM9260 |
46 | bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20" | 46 | bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20" |
47 | select HAVE_AT91_DBGU0 | 47 | select HAVE_AT91_DBGU0 |
48 | select HAVE_NET_MACB | ||
49 | select SOC_AT91SAM9 | 48 | select SOC_AT91SAM9 |
50 | help | 49 | help |
51 | Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE | 50 | Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE |
@@ -63,7 +62,6 @@ config SOC_AT91SAM9263 | |||
63 | bool "AT91SAM9263" | 62 | bool "AT91SAM9263" |
64 | select HAVE_AT91_DBGU1 | 63 | select HAVE_AT91_DBGU1 |
65 | select HAVE_FB_ATMEL | 64 | select HAVE_FB_ATMEL |
66 | select HAVE_NET_MACB | ||
67 | select SOC_AT91SAM9 | 65 | select SOC_AT91SAM9 |
68 | 66 | ||
69 | config SOC_AT91SAM9RL | 67 | config SOC_AT91SAM9RL |
@@ -76,7 +74,6 @@ config SOC_AT91SAM9G45 | |||
76 | bool "AT91SAM9G45 or AT91SAM9M10 families" | 74 | bool "AT91SAM9G45 or AT91SAM9M10 families" |
77 | select HAVE_AT91_DBGU1 | 75 | select HAVE_AT91_DBGU1 |
78 | select HAVE_FB_ATMEL | 76 | select HAVE_FB_ATMEL |
79 | select HAVE_NET_MACB | ||
80 | select SOC_AT91SAM9 | 77 | select SOC_AT91SAM9 |
81 | help | 78 | help |
82 | Select this if you are using one of Atmel's AT91SAM9G45 family SoC. | 79 | Select this if you are using one of Atmel's AT91SAM9G45 family SoC. |
@@ -86,7 +83,6 @@ config SOC_AT91SAM9X5 | |||
86 | bool "AT91SAM9x5 family" | 83 | bool "AT91SAM9x5 family" |
87 | select HAVE_AT91_DBGU0 | 84 | select HAVE_AT91_DBGU0 |
88 | select HAVE_FB_ATMEL | 85 | select HAVE_FB_ATMEL |
89 | select HAVE_NET_MACB | ||
90 | select SOC_AT91SAM9 | 86 | select SOC_AT91SAM9 |
91 | help | 87 | help |
92 | Select this if you are using one of Atmel's AT91SAM9x5 family SoC. | 88 | Select this if you are using one of Atmel's AT91SAM9x5 family SoC. |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 06e73bf665e9..09f9fa800b33 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
@@ -80,7 +80,6 @@ config PLATFORM_AT32AP | |||
80 | select ARCH_REQUIRE_GPIOLIB | 80 | select ARCH_REQUIRE_GPIOLIB |
81 | select GENERIC_ALLOCATOR | 81 | select GENERIC_ALLOCATOR |
82 | select HAVE_FB_ATMEL | 82 | select HAVE_FB_ATMEL |
83 | select HAVE_NET_MACB | ||
84 | 83 | ||
85 | # | 84 | # |
86 | # CPU types | 85 | # CPU types |
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index 57f78abe11d9..5d1ea30a3379 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig | |||
@@ -2,13 +2,9 @@ | |||
2 | # Atmel device configuration | 2 | # Atmel device configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | config HAVE_NET_MACB | ||
6 | bool | ||
7 | |||
8 | config NET_CADENCE | 5 | config NET_CADENCE |
9 | bool "Cadence devices" | 6 | bool "Cadence devices" |
10 | default y | 7 | default y |
11 | depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200) | ||
12 | ---help--- | 8 | ---help--- |
13 | If you have a network (Ethernet) card belonging to this class, say Y. | 9 | If you have a network (Ethernet) card belonging to this class, say Y. |
14 | Make sure you know the name of your card. Read the Ethernet-HOWTO, | 10 | Make sure you know the name of your card. Read the Ethernet-HOWTO, |
@@ -34,7 +30,6 @@ config ARM_AT91_ETHER | |||
34 | 30 | ||
35 | config MACB | 31 | config MACB |
36 | tristate "Cadence MACB/GEM support" | 32 | tristate "Cadence MACB/GEM support" |
37 | depends on HAVE_NET_MACB | ||
38 | select PHYLIB | 33 | select PHYLIB |
39 | ---help--- | 34 | ---help--- |
40 | The Cadence MACB ethernet interface is found on many Atmel AT32 and | 35 | The Cadence MACB ethernet interface is found on many Atmel AT32 and |