diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/net/tulip/Kconfig | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'drivers/net/tulip/Kconfig')
| -rw-r--r-- | drivers/net/tulip/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig index 1cc8cf4425d1..516713fa0a05 100644 --- a/drivers/net/tulip/Kconfig +++ b/drivers/net/tulip/Kconfig | |||
| @@ -101,6 +101,10 @@ config TULIP_NAPI_HW_MITIGATION | |||
| 101 | 101 | ||
| 102 | If in doubt, say Y. | 102 | If in doubt, say Y. |
| 103 | 103 | ||
| 104 | config TULIP_DM910X | ||
| 105 | def_bool y | ||
| 106 | depends on TULIP && SPARC | ||
| 107 | |||
| 104 | config DE4X5 | 108 | config DE4X5 |
| 105 | tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA" | 109 | tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA" |
| 106 | depends on PCI || EISA | 110 | depends on PCI || EISA |