summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-25 06:33:44 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-25 06:33:44 +0000
commit6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch)
tree41d0361e6b48ce74584c9a6fcb475d5054ca4141 /Documentation
parentee355114ec6062d00c1376b184b886a39e74fd4e (diff)
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Configure.help11
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 585a2b83b..6f6399e9c 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -8920,8 +8920,15 @@ CONFIG_EEPRO100
Enable Power Management (EXPERIMENTAL)
CONFIG_EEPRO100_PM
- If you want to play around with power management code
- that has been reported to lock up some machines, say Y here.
+ Many Intel EtherExpress PRO/100 PCI network cards are capable
+ of providing power management capabilities. To make use of these
+ capabilities, say Y.
+
+ WARNING: This option is intended for kernel developers and testers.
+ It is still very experimental, with some people reporting complete
+ lockups.
+
+ It is recommended to say N here.
ICL EtherTeam 16i/32 support (EXPERIMENTAL)
CONFIG_ETH16I