--- Configure.help-2.4.6	2001/07/06 17:08:25	1.1.1.7
+++ Configure.help-2.4.7	2001/12/20 11:38:45	1.1.1.8
@@ -3372,6 +3372,30 @@
   As this card technology is 15 years old, most people will answer N
   here.
 
+NEC PowerVR 2 display support
+CONFIG_FB_PVR2
+  Say Y here if you have a PowerVR 2 card in your box. If you plan to
+  run linux on your Dreamcast, you will have to say Y here. This driver
+  may or may not work on other PowerVR 2 cards, but is totally untested.
+  Use at your own risk. If unsure, say N.
+
+  This driver is also available as a module ( = code which can be
+  inserted and removed from the running kernel whenever you want).
+  The module will be called pvr2fb.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+
+  You can pass several parameters to the driver at boot time or at
+  module load time. The parameters look like "video=pvr2:XXX", where
+  the meaning of XXX can be found at the end of the main source file
+  (drivers/video/pvr2fb.c). Please see the file
+  Documentation/fb/pvr2fb.txt.
+
+Debug pvr2fb
+CONFIG_FB_PVR2_DEBUG
+  Say Y here if you wish for the pvr2fb driver to print out debugging
+  messages. Most people will want to say N here. If unsure, you will
+  also want to say N.
+
 Matrox unified accelerated driver (EXPERIMENTAL)
 CONFIG_FB_MATROX
   Say Y here if you have a Matrox Millennium, Matrox Millennium II,
@@ -3712,6 +3736,12 @@
   
   If unsure, say Y.
 
+Parallel+serial PCI card support
+CONFIG_PARPORT_SERIAL
+  This adds support for multi-IO PCI cards that have parallel and serial
+  ports.  You should say Y or M here.  If you say M, the module will be
+  called parport_serial.o.
+
 Use FIFO/DMA if available
 CONFIG_PARPORT_PC_FIFO
   Many parallel port chipsets provide hardware that can speed up
@@ -6849,7 +6879,7 @@
 
 TI PCILynx IEEE 1394 support
 CONFIG_IEEE1394_PCILYNX
-  Say Y here if you have a IEEE-1394 controller with the Texas
+  Say Y here if you have an IEEE-1394 controller with the Texas
   Instruments PCILynx chip.  Note: this driver is written for revision
   2 of this chip and may not work with revision 0.
 
@@ -6882,30 +6912,31 @@
   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
-  AIC-5800 chip. All Adaptec host adapters (89xx series) use this
-  chip, as well as miro's DV boards.
-
-  If you want to compile this 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 aic5800.o.
 
-OHCI (Open Host Controller Interface) support
+OHCI-1394 support
 CONFIG_IEEE1394_OHCI1394
-  Say Y here if you have a IEEE 1394 controller based on OHCI.
-  The current driver was only tested with OHCI chipsets made
-  by Texas Instruments. However, most third-party vendors use
-  TI chips.
+  Enable this driver if you have an IEEE 1394 controller based on the
+  OHCI-1394 specification. The current driver is only tested with OHCI
+  chipsets made by Texas Instruments and NEC. Most third-party vendors
+  use one of these chipsets. It should work with any OHCI-1394 compliant
+  card, however.
 
   If you want to compile this 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 ohci1394.o.
 
+OHCI-1394 Video support
+CONFIG_IEEE1394_VIDEO1394
+  This option enables video device usage for OHCI-1394 cards. Enable this
+  option only if you have an IEEE 1394 video device connected to an
+  OHCI-1394 card.
+
+SBP-2 support (Harddisks etc.)
+CONFIG_IEEE1394_SBP2
+  This option enables you to use SBP-2 devices connected to your IEEE 1394
+  bus. SBP-2 devices include harddrives and DVD devices.
+
 Raw IEEE 1394 I/O support
 CONFIG_IEEE1394_RAWIO
   Say Y here if you want support for the raw device. This is generally
@@ -8842,6 +8873,18 @@
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called myri_sbus.o.
 
+D-Link 2000-based Gigabit Ethernet support
+CONFIG_DL2K
+  This driver supports D-Link 2000-based gigabit ethernet cards, which
+  includes
+	D-Link DGE-550T Gigabit Ethernet Adapter.
+	D-Link DL2000-based Gigabit Ethernet Adapter.
+
+  If you want 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. This is recommended.
+  The module will be called dl2k.o.
+
 AMD LANCE and PCnet (AT1500 and NE2100) support
 CONFIG_LANCE
   If you have a network (Ethernet) card of this type, say Y and read
@@ -12162,34 +12205,38 @@
   The module is called freevxfs.o. If you want to compile it as a module,
   say M here and read Documentation/modules.txt. If unsure, say N.
 
-NTFS support (read only)
+NTFS file system support (read-only)
 CONFIG_NTFS_FS
   NTFS is the file system of Microsoft Windows NT. Say Y if you want
   to get read access to files on NTFS partitions of your hard drive.
   The Linux NTFS driver supports most of the mount options of the VFAT
-  driver, see Documentation/filesystems/ntfs.txt. Saying Y here will
-  give you read-only access to NTFS partitions.
+  driver, see <file:Documentation/filesystems/ntfs.txt>. Saying Y here
+  will give you read-only access to NTFS partitions.
 
   This code 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 ntfs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
+  module, say M here and read <file:Documentation/modules.txt>.
 
 NTFS write support (DANGEROUS)
 CONFIG_NTFS_RW
   If you say Y here, you will (maybe) be able to write to NTFS file
-  systems as well as read from them. The read-write support in
-  NTFS is far from being complete and is not well tested. If you
-  say Y here, back up your NTFS volume first since it may get
-  damaged. Also, make sure to run chkdsk from within Microsoft
-  Windows NT after having performed any writes to a NTFS partition
-  from Linux to detect any problems as early as possible.
+  systems as well as read from them. The read-write support in NTFS
+  is far from being complete and is not well tested. If you say Y
+  here, back up your NTFS volume first, since it will probably get
+  damaged. Also, download the Linux-NTFS project distribution from
+  Sourceforge at <http://linux-ntfs.sf.net/> and always run the
+  included ntfsfix utility after writing to an NTFS partition from
+  Linux to fix some of the damage done by the driver. You should run
+  ntfsfix _after_ unmounting the partition in Linux but _before_
+  rebooting into Windows. When Windows next boots, chkdsk will be
+  run automatically to fix the remaining damage.
   Please note that write support is limited to Windows NT4 and
   earlier versions.
 
   If unsure, say N.
 
-System V, Version 7, Xenix and Coherent filesystem support (read only)
+System V, Version 7, Xenix and Coherent filesystem support
 CONFIG_SYSV_FS
   SCO, Xenix and Coherent are commercial Unix systems for Intel
   machines, and Version 7 was used on the DEC PDP-11. Saying Y
@@ -12199,14 +12246,12 @@
 
   If you have floppies or hard disk partitions like that, it is likely
   that they contain binaries from those other Unix systems; in order
-  to run these binaries, you will want to install iBCS2 (Intel Binary
-  Compatibility Standard is a kernel module which lets you run SCO,
-  Xenix, Wyse, UnixWare, Dell Unix and System V programs under Linux
-  and is often needed to run commercial software that's only available
-  for those systems. It's available via FTP (user: anonymous) from
-  ftp://tsx-11.mit.edu/pub/linux/BETA ). NOTE: that will work only for
-  binaries from Intel-based systems; PDP ones will have to wait until
-  somebody ports Linux to -11 ;-)
+  to run these binaries, you will want to install linux-abi which is a
+  a set of kernel modules that lets you run SCO, Xenix, Wyse, UnixWare,
+  Dell Unix and System V programs under Linux.  It's available via FTP
+  (user: ftp) from ftp://ftp.openlinux.org/pub/people/hch/linux-abi).
+  NOTE: that will work only for binaries from Intel-based systems;
+  PDP ones will have to wait until somebody ports Linux to -11 ;-)
 
   If you only intend to mount files from some other Unix over the
   network using NFS, you don't need the System V file system support
@@ -12227,15 +12272,6 @@
 
   If you haven't heard about all of this before, it's safe to say N.
 
-SYSV file system write support (DANGEROUS)
-CONFIG_SYSV_FS_WRITE
-  If you say Y here, you will be able to write to hard drive
-  partitions and floppy disks which carry a SYSV file system used the
-  commercial Unixes SCO, Xenix and Coherent. 
-
-  This support is experimental and you may destroy your data. If
-  unsure, say N.
-
 Amiga FFS file system support
 CONFIG_AFFS_FS
   The Fast File System (FFS) is the common file system used on hard
@@ -13480,10 +13516,12 @@
   doing that; to actually get it to happen you need to pass the
   option "console=lp0" to the kernel at boot time.
 
-  Note that kernel messages can get lost if the printer is out of
-  paper (or off, or unplugged, or too busy..), but this behaviour
-  can be changed. See drivers/char/lp.c (do this at your own risk).
-
+  If the printer is out of paper (or off, or unplugged, or too
+  busy..) the kernel will stall until the printer is ready again.
+  By defining CONSOLE_LP_STRICT to 0 (at your own risk) you
+  can make the kernel continue when this happens,
+  but it'll lose the kernel messages.
+  
   If unsure, say N.
 
 Support for user-space parallel port device drivers
@@ -15587,9 +15625,18 @@
 VIA 82Cxxx Audio Codec
 CONFIG_SOUND_VIA82CXXX
   Say Y here to include support for the audio codec found on VIA
-  82Cxxx-based chips. Typically these are built into a motherboard. DO
-  NOT select Sound Blaster or Adlib with this driver, unless you have
-  a Sound Blaster or Adlib card in addition to your VIA audio chip.
+  82Cxxx-based chips. Typically these are built into a motherboard.
+
+  DO NOT select Sound Blaster or Adlib with this driver, unless
+  you have a Sound Blaster or Adlib card in addition to your VIA
+  audio chip.
+
+VIA 82C686 MIDI
+CONFIG_MIDI_VIA82CXXX
+   Answer Y to use the MIDI interface of the Via686. You may need to
+   enable this in the BIOS before it will work. This is for connection
+   to external MIDI hardware, and is not required for software playback
+   of MIDI files.
 
 NeoMagic 256AV/256ZX sound chipsets
 CONFIG_SOUND_NM256
