diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-23 16:35:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-23 16:35:04 -0400 |
| commit | 8be7cdccacfbfc707e7370cad9bb168defed636f (patch) | |
| tree | 8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/net/Kconfig | |
| parent | ecd4137320b59759bbe57eef89040ee3e5e66039 (diff) | |
| parent | 61fa9dcf9329cb92c220f7b656410fbe5e72f933 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ucc_geth.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 533cc411ee48..e5ffc1c606c1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1051,7 +1051,7 @@ config NI65 | |||
| 1051 | 1051 | ||
| 1052 | config DNET | 1052 | config DNET |
| 1053 | tristate "Dave ethernet support (DNET)" | 1053 | tristate "Dave ethernet support (DNET)" |
| 1054 | depends on NET_ETHERNET | 1054 | depends on NET_ETHERNET && HAS_IOMEM |
| 1055 | select PHYLIB | 1055 | select PHYLIB |
| 1056 | help | 1056 | help |
| 1057 | The Dave ethernet interface (DNET) is found on Qong Board FPGA. | 1057 | The Dave ethernet interface (DNET) is found on Qong Board FPGA. |