diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/tulip/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/tulip/Kconfig')
| -rw-r--r-- | drivers/net/tulip/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig index 516713fa0a05..1f8d4a8d8ea4 100644 --- a/drivers/net/tulip/Kconfig +++ b/drivers/net/tulip/Kconfig | |||
| @@ -11,8 +11,8 @@ menuconfig NET_TULIP | |||
| 11 | if NET_TULIP | 11 | if NET_TULIP |
| 12 | 12 | ||
| 13 | config DE2104X | 13 | config DE2104X |
| 14 | tristate "Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)" | 14 | tristate "Early DECchip Tulip (dc2104x) PCI support" |
| 15 | depends on PCI && EXPERIMENTAL | 15 | depends on PCI |
| 16 | select CRC32 | 16 | select CRC32 |
| 17 | ---help--- | 17 | ---help--- |
| 18 | This driver is developed for the SMC EtherPower series Ethernet | 18 | This driver is developed for the SMC EtherPower series Ethernet |
| @@ -151,7 +151,7 @@ config ULI526X | |||
| 151 | select CRC32 | 151 | select CRC32 |
| 152 | ---help--- | 152 | ---help--- |
| 153 | This driver is for ULi M5261/M5263 10/100M Ethernet Controller | 153 | This driver is for ULi M5261/M5263 10/100M Ethernet Controller |
| 154 | (<http://www.uli.com.tw/>). | 154 | (<http://www.nvidia.com/page/uli_drivers.html>). |
| 155 | 155 | ||
| 156 | To compile this driver as a module, choose M here. The module will | 156 | To compile this driver as a module, choose M here. The module will |
| 157 | be called uli526x. | 157 | be called uli526x. |