From 8564c1078381872faa1a12a73f49e19cb68f332b Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 10 Apr 2012 09:25:46 -0400 Subject: [PATCH] --- yaml --- r: 300572 b: refs/heads/master c: 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/wiznet/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0c76e8d0fb91..b838157f90ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f6f9d6fe533b59b389103d669c9bab78584960a +refs/heads/master: 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 diff --git a/trunk/drivers/net/ethernet/wiznet/Kconfig b/trunk/drivers/net/ethernet/wiznet/Kconfig index 2bb383caf2d8..c8291bf905a7 100644 --- a/trunk/drivers/net/ethernet/wiznet/Kconfig +++ b/trunk/drivers/net/ethernet/wiznet/Kconfig @@ -19,6 +19,7 @@ if NET_VENDOR_WIZNET config WIZNET_W5100 tristate "WIZnet W5100 Ethernet support" + depends on HAS_IOMEM ---help--- Support for WIZnet W5100 chips. @@ -31,6 +32,7 @@ config WIZNET_W5100 config WIZNET_W5300 tristate "WIZnet W5300 Ethernet support" + depends on HAS_IOMEM ---help--- Support for WIZnet W5300 chips. @@ -43,6 +45,7 @@ config WIZNET_W5300 choice prompt "WIZnet interface mode" + depends on WIZNET_W5100 || WIZNET_W5300 default WIZNET_BUS_ANY config WIZNET_BUS_DIRECT @@ -69,6 +72,7 @@ endchoice config WIZNET_TX_FLOW bool "Use transmit flow control" + depends on WIZNET_W5100 || WIZNET_W5300 default y help This enables transmit flow control for WIZnet chips.