diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-24 20:25:34 +0100 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-24 20:25:34 +0100 |
| commit | 61454f33389ecfac68846e07d29c8d18af342c43 (patch) | |
| tree | 7dcf069151aa7331c9261d262df4c192b2fabc34 /drivers/net/Kconfig | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs (diff) | |
| parent | Linux 2.6.29 (diff) | |
| download | linux-61454f33389ecfac68846e07d29c8d18af342c43.tar.xz linux-61454f33389ecfac68846e07d29c8d18af342c43.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a2f185fd7072..62d732a886f1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1040,6 +1040,17 @@ config NI65 To compile this driver as a module, choose M here. The module will be called ni65. +config DNET + tristate "Dave ethernet support (DNET)" + depends on NET_ETHERNET && HAS_IOMEM + select PHYLIB + help + The Dave ethernet interface (DNET) is found on Qong Board FPGA. + Say Y to include support for the DNET chip. + + To compile this driver as a module, choose M here: the module + will be called dnet. + source "drivers/net/tulip/Kconfig" config AT1700 @@ -2619,6 +2630,8 @@ config QLGE source "drivers/net/sfc/Kconfig" +source "drivers/net/benet/Kconfig" + endif # NETDEV_10000 source "drivers/net/tokenring/Kconfig" |