summaryrefslogtreecommitdiffstats
path: root/Documentation/Configure.help
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-08 00:53:00 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-08 00:53:00 +0000
commitb8553086288629b4efb77e97f5582e08bc50ad65 (patch)
tree0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /Documentation/Configure.help
parent75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff)
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'Documentation/Configure.help')
-rw-r--r--Documentation/Configure.help21
1 files changed, 17 insertions, 4 deletions
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index edaa621b0..62f8788f9 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -6462,6 +6462,14 @@ CONFIG_IEEE1394_PCILYNX_LOCALRAM
If unsure, say N.
+Support for non-IEEE1394 local ports
+CONFIG_IEEE1394_PCILYNX_PORTS
+ This option enables driver code to access the RAM, ROM and AUX ports
+ of the PCILynx through character devices in /dev. If you don't know
+ what this is about then you won't need it.
+
+ If unsure, say N.
+
Adaptec AIC-5800 IEEE 1394 support
CONFIG_IEEE1394_AIC5800
Say Y here if you have a IEEE 1394 controller using the Adaptec
@@ -12458,10 +12466,15 @@ CONFIG_ACPI
below, then ACPI has precedence in the sense that, if your hardware
supports ACPI, it will be used and APM won't.
- To compile this driver as a module ( = code which can be inserted in
- and removed from the running kernel whenever you want), say M here
- and read Documentation/modules.txt. The module will be called
- acpi.o.
+ACPI interpreter (EXPERIMENTAL)
+CONFIG_ACPI_INTERPRETER
+ If you say Y here, an ACPI interpreter will be included in your
+ kernel, eventually making the full range of ACPI features
+ available on systems that support ACPI. Note, this option will
+ enlarge your kernel by about 120K.
+
+ The interpreter is currently experimental so only say Y if
+ you know what you are doing.
Enter S1 for sleep (EXPERIMENTAL)
CONFIG_ACPI_S1_SLEEP