diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 09:25:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 09:25:46 -0400 |
| commit | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (patch) | |
| tree | 4771531f44e5f60461cbc688b62651bf1ceec455 | |
| parent | 2f6f9d6fe533b59b389103d669c9bab78584960a (diff) | |
wiznet: Fix Kconfig dependencies.
Both drivers need to depend upon HAS_IOMEM, otherwise we
get a build failure on platforms like S390.
All the driver specific config options need to depend upon
the drivers themselves.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/wiznet/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig index 2bb383caf2d8..c8291bf905a7 100644 --- a/drivers/net/ethernet/wiznet/Kconfig +++ b/drivers/net/ethernet/wiznet/Kconfig | |||
| @@ -19,6 +19,7 @@ if NET_VENDOR_WIZNET | |||
| 19 | 19 | ||
| 20 | config WIZNET_W5100 | 20 | config WIZNET_W5100 |
| 21 | tristate "WIZnet W5100 Ethernet support" | 21 | tristate "WIZnet W5100 Ethernet support" |
| 22 | depends on HAS_IOMEM | ||
| 22 | ---help--- | 23 | ---help--- |
| 23 | Support for WIZnet W5100 chips. | 24 | Support for WIZnet W5100 chips. |
| 24 | 25 | ||
| @@ -31,6 +32,7 @@ config WIZNET_W5100 | |||
| 31 | 32 | ||
| 32 | config WIZNET_W5300 | 33 | config WIZNET_W5300 |
| 33 | tristate "WIZnet W5300 Ethernet support" | 34 | tristate "WIZnet W5300 Ethernet support" |
| 35 | depends on HAS_IOMEM | ||
| 34 | ---help--- | 36 | ---help--- |
| 35 | Support for WIZnet W5300 chips. | 37 | Support for WIZnet W5300 chips. |
| 36 | 38 | ||
| @@ -43,6 +45,7 @@ config WIZNET_W5300 | |||
| 43 | 45 | ||
| 44 | choice | 46 | choice |
| 45 | prompt "WIZnet interface mode" | 47 | prompt "WIZnet interface mode" |
| 48 | depends on WIZNET_W5100 || WIZNET_W5300 | ||
| 46 | default WIZNET_BUS_ANY | 49 | default WIZNET_BUS_ANY |
| 47 | 50 | ||
| 48 | config WIZNET_BUS_DIRECT | 51 | config WIZNET_BUS_DIRECT |
| @@ -69,6 +72,7 @@ endchoice | |||
| 69 | 72 | ||
| 70 | config WIZNET_TX_FLOW | 73 | config WIZNET_TX_FLOW |
| 71 | bool "Use transmit flow control" | 74 | bool "Use transmit flow control" |
| 75 | depends on WIZNET_W5100 || WIZNET_W5300 | ||
| 72 | default y | 76 | default y |
| 73 | help | 77 | help |
| 74 | This enables transmit flow control for WIZnet chips. | 78 | This enables transmit flow control for WIZnet chips. |
