summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 18:54:49 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 18:54:49 +0000
commit5514f4babeeb3af00ee0c325e3cda7a562cc3d65 (patch)
treeedd733879cab73e41324a99ca5da7bc154c4196d /Documentation
parent6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff)
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/Configure.help13
-rw-r--r--Documentation/kbuild/config-language.txt1
2 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index b94126f2c..585a2b83b 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -16445,6 +16445,19 @@ CONFIG_BVME6000_SCC
boards from BVM Ltd. Everyone using one of these boards should say
Y here.
+7-Segment Display support
+CONFIG_DISPLAY7SEG
+ This is the driver for the 7-segment display and LED present on
+ Sun Microsystems CompactPCI models CP1400 and CP1500.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called display7seg.o. If you want to compile it
+ as a module, say M here and read Documentation/modules.txt.
+
+ If you do not have a CompactPCI model CP1400 or CP1500, or
+ another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
+ you should say N to this option.
#
# A couple of things I keep forgetting:
diff --git a/Documentation/kbuild/config-language.txt b/Documentation/kbuild/config-language.txt
index dc1756013..d139848da 100644
--- a/Documentation/kbuild/config-language.txt
+++ b/Documentation/kbuild/config-language.txt
@@ -291,6 +291,7 @@ Example:
This verb displays /prompt/ to the user, accepts a value from the user,
and assigns that value to /symbol/. /word/ is the default value. Legal
input values are any ASCII string, except for the characters '"' and '\\'.
+Configure will trap an input string of "?" to display help.
The default value is mandatory.