git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
net
/
tulip
/
Kconfig
diff --git
a/drivers/net/tulip/Kconfig
b/drivers/net/tulip/Kconfig
index
516713f
..
1f8d4a8
100644
(file)
--- a/
drivers/net/tulip/Kconfig
+++ b/
drivers/net/tulip/Kconfig
@@
-11,8
+11,8
@@
menuconfig NET_TULIP
if NET_TULIP
config DE2104X
if NET_TULIP
config DE2104X
- tristate "Early DECchip Tulip (dc2104x) PCI support
(EXPERIMENTAL)
"
- depends on PCI
&& EXPERIMENTAL
+ tristate "Early DECchip Tulip (dc2104x) PCI support"
+ depends on PCI
select CRC32
---help---
This driver is developed for the SMC EtherPower series Ethernet
select CRC32
---help---
This driver is developed for the SMC EtherPower series Ethernet
@@
-151,7
+151,7
@@
config ULI526X
select CRC32
---help---
This driver is for ULi M5261/M5263 10/100M Ethernet Controller
select CRC32
---help---
This driver is for ULi M5261/M5263 10/100M Ethernet Controller
- (<http://www.
uli.com.tw/
>).
+ (<http://www.
nvidia.com/page/uli_drivers.html
>).
To compile this driver as a module, choose M here. The module will
be called uli526x.
To compile this driver as a module, choose M here. The module will
be called uli526x.