Merge with 2.3.99-pre6.

24 files changed, 1172 insertions, 491 deletions

diff --git a/Documentation/Changes b/Documentation/Changes
index 73511d74a..f5c4d516f 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -62,7 +62,7 @@ running, the suggested command should tell you.
 - Bash                   1.14.7                  ; bash -version
 - Ncpfs                  2.2.0                   ; ncpmount -v
 - Pcmcia-cs              3.1.2                   ; cardmgr -V
-- PPP                    2.3.11                  ; pppd --version
+- PPP                    2.4.0b1                 ; pppd --version
 - Util-linux             2.9i                    ; chsh -v
 - isdn4k-utils           v3.1beta7               ; isdnctrl 2>&1|grep version
 
@@ -391,22 +391,33 @@ support utils to the latest release of pcmcia-cs.
 PPP
 ===
 
-   Due to changes in the PPP driver and routing code, those of you
+   The PPP driver has been restructured to support multilink and
+to enable it to operate over diverse kinds of media.  Those of you
 using PPP networking will need to upgrade your pppd to at least
-version 2.3.11. See ftp://cs.anu.edu.au/pub/software/ppp/ for newest
-versions.
+version 2.4.0b1.  See ftp://linuxcare.com.au/pub/ppp/ for the latest
+version.
 
-   You must make sure that the special device file /dev/ppp exists.
-It can be made by executing this command as root:
+   If you are not using devfs, you must make sure that the special
+device file /dev/ppp exists.  It can be made by executing this command
+as root:
 
 	mknod /dev/ppp c 108 0
 
    If you have built ppp support as modules, you should put the lines
-below in your /etc/modules.conf file. I assume you want asynchronous
-ppp; replace ppp_async by ppp_synctty if you want synchronous ppp.
+below in your /etc/modules.conf file.
 
-	alias char-major-108 ppp_generic
-	alias tty-ldisc-3 ppp_async
+	alias char-major-108	ppp_generic
+	alias /dev/ppp		ppp_generic
+	alias tty-ldisc-3	ppp_async
+	alias tty-ldisc-14	ppp_synctty
+	alias ppp-compress-21	bsd_comp
+	alias ppp-compress-24	ppp_deflate
+	alias ppp-compress-26	ppp_deflate
+
+If you are using devfsd and you have ppp_generic as a module, put the
+following line in your /etc/devfsd.conf:
+
+	LOOKUP		ppp		MODLOAD
 
 iBCS
 ====
@@ -425,12 +436,6 @@ Psmisc
    fuser, which comes with psmisc, reads /proc/*/fd/* to do its job.
 Upgrade psmisc if 2.2 changes to /proc broke the version you're using.
 
-Tunelp
-======
-
-   A new version of tunelp is available which will allow you to enable
-"trustirq" mode, improving printing while using IRQ-driven lp ports.
-
 PCI utils
 =========
 
@@ -525,6 +530,17 @@ Since 2.3.47 the kernel contains the Logical Volume Manager aka LVM. To use it,
 you need to install the LVM tools. More information can be found at the home page
 of the LVM project at http://linux.msede.com/lvm/.
 
+Inline Documentation
+====================
+Many of the functions available for modules to use are now documented
+with specially-formatted comments near their definitions.  These
+comments can be combined with the SGML templates in the
+Documentation/DocBook directory to make DocBook files, which can then
+be combined with DocBook stylesheets to make PostScript documents,
+HTML pages, PDF files, and so on.  In order to convert from DocBook
+format to a format of your choice, you'll need to install jade, as
+well as some stylesheets.
+
 
 Where to get the files
 **********************
@@ -718,8 +734,8 @@ ftp://metalab.unc.edu/pub/Linux/system/serial/setserial-2.15.tar.gz
 PPP
 ===
 
-The 2.3.11 release:
-ftp://cs.anu.edu.au/pub/software/ppp/ppp-2.3.11.tar.gz
+The 2.4.0b1 release:
+ftp://linuxcare.com.au/pub/ppp/ppp-2.4.0b1.tar.gz
 
 IP Chains
 =========
@@ -775,12 +791,6 @@ The 0.1.2 release:
 http://linux.powertweak.com/files/powertweak-0.1.2.tgz
 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/powertweak/powertweak-0.1.2.tgz
 
-Tunelp
-======
-
-The 0-2.1.131 release:
-ftp://e-mind.com/pub/linux/tunelp/tunelp-0-2.1.131.tar.gz
-
 Xosview
 =======
 
@@ -818,6 +828,17 @@ Logical Volume Manager
 The 0.7 release:
 ftp://linux.msede.com/lvm/v0.7/lvm_0.7.tar.gz
 
+Jade
+====
+
+The 1.2.1 release:
+ftp://ftp.jclark.com/pub/jade/jade-1.2.1.tar.gz
+
+DSSSL Stylesheets for the DocBook DTD
+=====================================
+
+http://nwalsh.com/docbook/dsssl/
+
 
 Other Info
 ==========
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index eb5e4efec..e7dfc2b76 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -18,7 +18,7 @@
 #   - Polish, by Cezar Cichocki (cezar@cs.net.pl), at
 #     http://www.cs.net.pl/~cezar/Kernel
 #   - German, by SuSE, at http://www.suse.de/~ke/kernel . This patch
-#     includes infrastructure to support different languages as well.
+#     also includes infrastructure to support different languages.
 #
 # To access a document on the WWW, you need to have a direct Internet
 # connection and a browser program such as netscape or lynx. If you
@@ -187,48 +187,44 @@ CONFIG_MATHEMU
 
 High Memory support
 CONFIG_NOHIGHMEM
-  If you are compiling a kernel which will never run on a machine
-  with more than 1 Gigabyte total physical RAM, answer "off"
-  here (default choice).  This will result in the old "3GB/1GB"
-  virtual/physical memory split. 3GB are mapped so as each processus
-  sees a 3GB virtual memory space.
-  The remaining part of the 4GB virtual memory space is used by the
-  kernel to 'permanently map' as much physical memory as possible.
-  Certain types of applications perform better if there is more
-  'permanently mapped' kernel memory.
-  Certain types of applications (eg. database servers) perform
-  better if they have as much virtual memory per process as possible.
-
   Linux can use up to 64 Gigabytes of physical memory on x86 systems.
-  However 32-bit x86 processors have only 4 Gigabytes of virtual memory
-  space. 
-
-  Any potentially remaining part of physical memory is called
-  'high memory' that is all the physical RAM that could not be directly
-  mapped by the kernel - ie. 3GB if there is 4GB RAM in the system,
-  7GB if there is 8GB RAM in the system.
-
-  If 4 Gigabytes physical RAM or less is used then answer "4GB" here.
+  However, the address space of 32-bit x86 processors is only 4
+  Gigabytes large. That means that, if you have a large amount of
+  physical memory, not all of it can be "permanently mapped" by the
+  kernel. The physical memory that's not permanently mapped is called
+  "high memory".
+
+  If you are compiling a kernel which will never run on a machine with
+  more than 1 Gigabyte total physical RAM, answer "off" here (default
+  choice and suitable for most users). This will result in a "3GB/1GB"
+  split: 3GB are mapped so that each process sees a 3GB virtual memory
+  space and the remaining part of the 4GB virtual memory space is used
+  by the kernel to permanently map as much physical memory as
+  possible.
+
+  If the machine has between 1 and 4 Gigabytes physical RAM, then
+  answer "4GB" here.
 
   If more than 4 Gigabytes is used then answer "64GB" here. This
   selection turns Intel PAE (Physical Address Extension) mode on.
   PAE implements 3-level paging on IA32 processors. PAE is fully
   supported by Linux, PAE mode is implemented on all recent Intel
-  processors (PPro and better). NOTE: The "64GB" kernel will not
-  boot CPUs that not support PAE!
+  processors (Pentium Pro and better). NOTE: If you say "64GB" here,
+  then the kernel will not boot on CPUs that don't support PAE!
 
   The actual amount of total physical memory will either be
-  autodetected or can be forced by using a kernel command line option
+  auto detected or can be forced by using a kernel command line option
   such as "mem=256M". (Try "man bootparam" or see the documentation of
   your boot loader (lilo or loadlin) about how to pass options to the
-  kernel at boot time. The lilo procedure is also explained in the
-  SCSI-HOWTO, available from http://www.linuxdoc.org/docs.html#howto .)
+  kernel at boot time.) 
+
+  If unsure, say "off".
 
 Normal PC floppy disk support
 CONFIG_BLK_DEV_FD
   If you want to use the floppy disk drive(s) of your PC under Linux,
   say Y. Information about this driver, especially important for IBM
-  Thinkpad users, is contained in drivers/block/README.fd. This file
+  Thinkpad users, is contained in Documentation/floppy.txt. That file
   also contains the location of the Floppy driver FAQ as well as
   location of the fdutils package used to configure additional
   parameters of the driver at run time.
@@ -276,7 +272,9 @@ CONFIG_BLK_DEV_LOOP
   Saying Y here will allow you to use a regular file as a block
   device; you can then create a file system on that block device and
   mount it just as you would mount other block devices such as hard
-  drive partitions, CDROM drives or floppy drives.
+  drive partitions, CDROM drives or floppy drives. The loop devices
+  are block special device files with major number 7 and typically
+  called /dev/loop0, /dev/loop1 etc.
 
   This is useful if you want to check an ISO 9660 file system before
   burning the CD, or if you want to use floppy images without first
@@ -291,17 +289,18 @@ CONFIG_BLK_DEV_LOOP
   bits of, say, a sound file). This is also safe if the file resides
   on a remote file server. If you want to do this, you will first have
   to acquire and install a kernel patch from
-  ftp://ftp.replay.com/pub/crypto/linux/all or
-  ftp://verden.pvv.org/pub/linux/kerneli/v2.1/ , and then you need to
+  ftp://ftp.kerneli.org/pub/kerneli/ , and then you need to
   say Y to this option.
 
   Note that alternative ways to use encrypted file systems are
   provided by the cfs package, which can be gotten from
-  ftp://ftp.replay.com/pub/crypto/disk/ , and the newer tcfs package,
-  available at http://tcfs.dia.unisa.it/ . You do not need to say Y
-  here if you want to use one of these. However, using cfs requires
-  saying Y to "NFS file system support" below while using tcfs
-  requires applying a kernel patch.
+  ftp://ftp.kerneli.org/pub/kerneli/net-source/ , and the newer tcfs
+  package, available at http://tcfs.dia.unisa.it/ . You do not need to
+  say Y here if you want to use one of these. However, using cfs
+  requires saying Y to "NFS file system support" below while using
+  tcfs requires applying a kernel patch. An alternative steganography
+  solution is provided by StegFS, also available from
+  ftp://ftp.kerneli.org/pub/kerneli/net-source/ .
 
   To use the loop device, you need the losetup utility and a recent
   version of the mount program, both contained in the util-linux
@@ -533,8 +532,11 @@ CONFIG_BLK_DEV_IDEFLOPPY
   drives, similar to the SCSI protocol. 
 
   The LS-120 and the IDE/ATAPI Iomega ZIP drive are also supported by
-  this driver. (ATAPI PD-CD/CDR drives are not supported by this
-  driver; support for PD-CD/CDR drives is available if you answer Y to
+  this driver. For information about jumper settings and the question
+  of when a ZIP drive uses a partition table, see
+  http://www.win.tue.nl/~aeb/linux/zip/zip-1.html .
+  (ATAPI PD-CD/CDR drives are not supported by this driver; support
+  for PD-CD/CDR drives is available if you answer Y to 
   "SCSI emulation support", below).
 
   If you say Y here, the FLOPPY drive will be identified along with
@@ -715,21 +717,25 @@ CONFIG_BLK_DEV_3W_XXXX_RAID
 
   Please read the comments at the top of drivers/scsi/3w-xxxx.c  
 
-AEC6210 chipset support
-CONFIG_BLK_DEV_AEC6210
+AEC62XX chipset support
+CONFIG_BLK_DEV_AEC62XX
   This driver adds up to 4 more EIDE devices sharing a single
   interrupt. This add-on card is a bootable PCI UDMA controller. In
   order to get this card to initialize correctly in some cases, you
   should say Y here, and preferably also to "Use DMA by default when
   available".
 
-  Please read the comments at the top of drivers/ide/aec6210.c If
-  you say Y here, then say Y to "Use DMA by default when available" as
+  The ATP850U/UF is an UltraDMA 33 chipset base.
+  The ATP860 is an UltraDMA 66 chipset base.
+  The ATP860M(acintosh) version is an UltraDMA 66 chipset base.
+
+  Please read the comments at the top of drivers/ide/aec62xx.c
+  If you say Y here, then say Y to "Use DMA by default when available" as
   well.
 
-AEC6210 Tuning support (WIP)
-CONFIG_AEC6210_TUNING
-  Please read the comments at the top of drivers/ide/aec6210.c  
+AEC62XX Tuning support (WIP)
+CONFIG_AEC62XX_TUNING
+  Please read the comments at the top of drivers/ide/aec62xx.c  
   If unsure, say N.
 
 ALI M15x3 chipset support
@@ -969,6 +975,12 @@ CONFIG_BLK_DEV_VIA82CXXX
 
   If unsure, say N.
 
+VIA82CXXX Tuning support (WIP)
+CONFIG_VIA82CXXX_TUNING
+  Please read the comments at the top of drivers/ide/via82cxxx.c
+
+  If unsure, say N.
+
 Other IDE chipset support
 CONFIG_IDE_CHIPSETS
   Say Y here if you want to include enhanced support for various IDE
@@ -1417,7 +1429,7 @@ CONFIG_BLK_DEV_LVM
   devices named /dev/VolumeGroupName/LogicalVolumeName.
 
   For details see Documentation/LVM-HOWTO. You will need supporting
-  user space software from http://linux.msede.com/lvm .
+  user space software; location is in Documentation/Changes.
 
   If you want to compile this support as a module ( = code which can
   be inserted in and removed from the running kernel whenever you
@@ -1437,12 +1449,12 @@ Multiple devices driver support
 CONFIG_BLK_DEV_MD
   This driver lets you combine several hard disk partitions into one
   logical block device. This can be used to simply append one
-  partition to another one or to combine several redundant
-  hard disks to a RAID1/4/5 device so as to provide protection against
-  hard disk failures. This is called "Software RAID" since the
-  combining of the partitions is done by the kernel. "Hardware RAID"
-  means that the combining is done by a dedicated controller; if you
-  have such a controller, you do not need to say Y here.
+  partition to another one or to combine several redundant hard disks
+  into a RAID1/4/5 device so as to provide protection against hard
+  disk failures. This is called "Software RAID" since the combining of
+  the partitions is done by the kernel. "Hardware RAID" means that the
+  combining is done by a dedicated controller; if you have such a
+  controller, you do not need to say Y here.
 
   More information about Software RAID on Linux is contained in the
   Software-RAID mini-HOWTO, available from
@@ -1510,7 +1522,7 @@ CONFIG_MD_MIRRORING
 RAID-4/RAID-5 mode
 CONFIG_MD_RAID5
   A RAID-5 set of N drives with a capacity of C MB per drive provides
-  the capacity of C * (N - 1) drives, and protects against a failure
+  the capacity of C * (N - 1) MB, and protects against a failure
   of a single drive. For a given sector (row) number, (N - 1) drives
   contain data sectors, and one drive contains the parity protection.
   For a RAID-4 set, the parity blocks are present on a single drive,
@@ -1619,6 +1631,56 @@ CONFIG_JAZZ_ESP
   4000, Acer PICA, Olivetti M700-10 and a few other identical OEM
   systems.
 
+PCMCIA SCSI adapter support
+CONFIG_SCSI_PCMCIA
+  Say Y here if you intend to attach a PCMCIA or CardBus card to your
+  computer which acts as a SCSI host adapter. These are credit card
+  size devices often used with laptops.
+
+  Note that the answer to this question won't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions PCMCIA SCSI host adapters.
+
+Adaptec AHA152X PCMCIA support
+CONFIG_PCMCIA_AHA152X
+  Say Y here if you intend to attach this type of PCMCIA SCSI host
+  adapter to your computer.
+
+  This driver is also available as a module called aha152x_cs.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+Qlogic PCMCIA support
+CONFIG_PCMCIA_QLOGIC
+  Say Y here if you intend to attach this type of PCMCIA SCSI host
+  adapter to your computer.
+
+  This driver is also available as a module called qlogic_cs.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+Future Domain PCMCIA support
+CONFIG_PCMCIA_FDOMAIN
+  Say Y here if you intend to attach this type of PCMCIA SCSI host
+  adapter to your computer.
+
+  This driver is also available as a module called fdomain_cs.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+Adaptec APA1480 CardBus support
+CONFIG_PCMCIA_APA1480
+  Say Y here if you intend to attach this type of CardBus SCSI host
+  adapter to your computer.
+
+  This driver is also available as a module called apa1480_cb.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
 CPU type
 CONFIG_CPU_R3000
   Please make sure to pick the right CPU type. Linux/MIPS is not
@@ -1709,8 +1771,8 @@ CONFIG_NETFILTER
 
   Various modules exist for netfilter which replace the previous
   masquerading (ipmasqadm), packet filtering (ipchains), transparent
-  proxying, and portforwarding mechanisms. More information is
-  available from http://netfilter.kernelnotes.org .
+  proxying, and portforwarding mechanisms. Please see
+  Documentation/Changes for the location of these packages.
  
   Make sure to say N to "Fast switching" below if you intend to say Y
   here, as Fast switching currently bypasses netfilter.
@@ -1746,10 +1808,10 @@ CONFIG_IP_NF_FTP
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt.  If unsure, say `Y'.
 
-IP: userspace queueing via NETLINK (EXPERIMENTAL)
+IP: user space queueing via NETLINK (EXPERIMENTAL)
 CONFIG_IP_NF_QUEUE
-  Netfilter has the ability to queue packets to userspace: the netlink
-  device can be used to access them using this driver.
+  Netfilter has the ability to queue packets to user space: the
+  netlink device can be used to access them using this driver.
 
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt.  If unsure, say `N'.
@@ -3808,12 +3870,17 @@ CONFIG_IPV6_NETLINK
   
 Kernel httpd acceleration (EXPERIMENTAL)
 CONFIG_KHTTPD
-  The kernel httpd acceleration daemon (kHTTPd) is a (limited) 
-  web server built into the kernel. It is limited since it can only
-  serve files from the file system. Saying "M" here builds the
-  kHTTPd module; this is NOT enough to have a working kHTTPd. 
-  For safety reasons, the module has to be activated by doing a
-  "echo 1 > /proc/sys/net/khttpd/start" after inserting the module.
+  The kernel httpd acceleration daemon (kHTTPd) is a (limited) web
+  server built into the kernel. It is limited since it can only serve
+  files from the file system and cannot deal with executable content
+  such as CGI scripts. Serving files is sped up if you use kHTTPd.
+  If kHTTPd is not able to fulfill a request, it can transparently
+  pass it through to a user space web server such as apache.
+
+  Saying "M" here builds the kHTTPd module; this is NOT enough to have
+  a working kHTTPd. For safety reasons, the module has to be activated
+  by doing a "echo 1 > /proc/sys/net/khttpd/start" after inserting the
+  module.
 
   Before using this, read the README in net/khttpd !
 
@@ -4841,12 +4908,16 @@ CONFIG_PHONE_IXJ
   say N here.
 
 FORE Systems 200E-series
-CONFIG_ATM_FORE200E
+CONFIG_ATM_FORE200E_MAYBE
   This is a driver for the FORE Systems 200E-series ATM adapter
   cards. It simultaneously supports PCA-200E and SBA-200E models
   on PCI and SBUS hosts. Say Y (or M to compile as a module
   named fore_200e.o) here if you have one of these ATM adapters.
  
+  Note that the driver will actually be compiled only if you
+  additionally enable the support for PCA-200E and/or SBA-200E
+  cards.
+
   See the file Documentation/networking/fore200e.txt for further
   details.
  
@@ -5026,15 +5097,17 @@ CONFIG_CHR_DEV_SG
   about anything having "SCSI" in its name other than hard disks,
   CDROMs or tapes, say Y here. These won't be supported by the kernel
   directly, so you need some additional software which knows how to
-  talk to these devices using the SCSI protocol. For scanners, look at
-  SANE (www.mostang.com/sane). For CD writer software look at cdrecord
-  (www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private
-  /cdrecord.html) and for burning a "disk at once": cdrdao
-  (www.ping.de/sites/daneb/cdrdao.html). Cdparanoia is a high quality
-  digital reader of audio CDs (www.xiph.org/paranoia).
-  For other devices, it's possible that you'll have to write the driver
-  software yourself. Please read the file Documentation/scsi-generic.txt
-  for more information.
+  talk to these devices using the SCSI protocol:
+
+  For scanners, look at SANE (http://www.mostang.com/sane). For CD
+  writer software look at cdrecord
+  (http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html)
+  and for burning a "disk at once": cdrdao
+  (http://www.ping.de/sites/daneb/cdrdao.html). Cdparanoia is a high
+  quality digital reader of audio CDs (http://www.xiph.org/paranoia).
+  For other devices, it's possible that you'll have to write the
+  driver software yourself. Please read the file
+  Documentation/scsi-generic.txt for more information.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -5858,6 +5931,15 @@ CONFIG_SCSI_QLOGIC_FC
   The module will be called qlogicfc.o. If you want to compile it as
   a module, say M here and read Documentation/modules.txt.
 
+Qlogic QLA 1280 SCSI support
+CONFIG_SCSI_QLOGIC_1280
+  Say Y if you have a QLogic ISP1x80/1x160 SCSI host adapter.
+
+  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 qla1280.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+
 Seagate ST-02 and Future Domain TMC-8xx SCSI support
 CONFIG_SCSI_SEAGATE
   These are 8-bit SCSI controllers; the ST-01 is also supported by
@@ -6541,6 +6623,17 @@ CONFIG_PPP
   Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
+PPP multilink support (EXPERIMENTAL)
+CONFIG_PPP_MULTILINK
+  PPP multilink is a protocol (defined in RFC 1990) which allows you
+  to combine several (logical or physical) lines into one logical PPP
+  connection, so that you can utilize your full bandwidth.
+
+  This has to be supported at the other end as well and you need a
+  version of the pppd daemon which understands the multilink protocol.
+
+  If unsure, say N.
+
 PPP support for async serial ports
 CONFIG_PPP_ASYNC
   Say Y (or M) here if you want to be able to use PPP over standard
@@ -6552,6 +6645,8 @@ CONFIG_PPP_ASYNC
   into and removed from the running kernel).  If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
+  If unsure, say Y.
+
 PPP support for sync tty ports
 CONFIG_PPP_SYNC_TTY
   Say Y (or M) here if you want to be able to use PPP over synchronous
@@ -6902,15 +6997,16 @@ CONFIG_ARCNET_COM20020_CS
   as a module, say M here and read Documentation/modules.txt. If
   unsure, say N.
 
-3Com 3c575 CardBus support
-CONFIG_PCMCIA_3C575
-  This driver supports the 3Com 3c575 series of CardBus Fast Ethernet
-  adapters.
+IBM PCMCIA Token Ring adapter support
+CONFIG_PCMCIA_IBMTR
+  Say Y here if you intend to attach this type of Token Ring PCMCIA
+  card to your computer. You then also need to say Y to "Token Ring
+  driver support". 
 
-  This driver can only be compiled as a module ( = code which can be
+  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 3c575_cb.o. If you want to do that, say M
-  here and read Documentation/modules.txt.  If unsure, say N.
+  The module will be called ibmtr_cs.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
 Xircom Tulip-like CardBus support
 CONFIG_PCMCIA_XIRTULIP
@@ -7216,7 +7312,7 @@ CONFIG_NET_SCHED
   Differentiated Services (diffserv) and Resource Reservation Protocol
   (RSVP) on your Linux router if you also say Y to "QoS support",
   "Packet classifier API" and to some classifiers below. Documentation
-  and software is at http://icawwww1.ipfl.ch/linux/diffserv/ .
+  and software is at http://icawww1.epfl.ch/linux-diffserv/ .
 
   If you say Y here and to "/proc file system" below, you will be able
   to read status information about packet schedulers from the file
@@ -7346,7 +7442,7 @@ CONFIG_NET_QOS
   Differentiated Services (diffserv) and Resource Reservation Protocol
   (RSVP) on your Linux router if you also say Y to "Packet classifier
   API" and to some classifiers below. Documentation and software is at
-  http://icawwww1.ipfl.ch/linux/diffserv/ .
+  http://icawww1.epfl.ch/linux-diffserv/ .
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -7369,7 +7465,7 @@ CONFIG_NET_CLS
   This will enable you to use Differentiated Services (diffserv) and
   Resource Reservation Protocol (RSVP) on your Linux router.
   Documentation and software is at
-  http://icawwww1.ipfl.ch/linux/diffserv/ .
+  http://icawww1.epfl.ch/linux-diffserv/ .
 
 ### Add
 #tristate '    TC index classifier' CONFIG_NET_CLS_TCINDEX
@@ -7492,6 +7588,31 @@ CONFIG_COSA
   The module will be called cosa.o. For general information about
   modules read Documentation/modules.txt.
 
+Lan Media sync serial boards support
+CONFIG_LANMEDIA
+  This is a driver for the following Lan Media family of serial boards.
+ 
+  LMC 1000 board allows you to connect synchronous serial devices (for
+  example base-band modems, or any other device with the X.21, V.24,
+  V.35 or V.36 interface) to your Linux box.
+ 
+  LMC 1200 with on board DSU board allows you to connect your Linux
+  box dirrectly to a T1 or E1 circuit.
+ 
+  LMC 5200 board provides a HSSI interface capable of runnig up to
+  52 mbits per second.
+ 
+  LMC 5245 board connects directly to a T3 circuit saving the
+  additional external hardware.
+ 
+  To change setting such as syncPPP vs cisco HDLC or clock source you
+  will need lmcctl.  It it available at ftp.lanmedia.com.
+ 
+  This code is also available as a module called lmc.o ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
 Fibre Channel driver support
 CONFIG_NET_FC
   Fibre Channel is a high speed serial protocol mainly used to connect
@@ -8163,12 +8284,19 @@ CONFIG_3C515
   Documentation/networking/net-modules.txt. The module will be called
   3c515.o.
 
-3c590 series (592/595/597) "Vortex" support
+3c59x/3c90x/3c575_Cardbus series "Vortex/Boomerang/Cyclone" support
 CONFIG_VORTEX
-  If you have a 3Com "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597)
-  or "Boomerang" series (EtherLink XL 3c900 or 3c905) network
-  (Ethernet) card, say Y and read the Ethernet-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto . More specific
+  This option enables driver support for a large number of 10mbps and
+  10/100mbps EISA, PCI and PCMCIA 3Com network cards:
+
+  "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
+  "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
+  "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
+  "Tornado"   (3c905)                                  PCI
+  "Hurricane" (3c555/3cSOHO)                           PCI
+
+  If you have such a card, say Y and read the Ethernet-HOWTO, available
+  from http://www.linuxdoc.org/docs.html#howto . More specific
   information is in Documentation/networking/vortex.txt and in the
   comments at the beginning of drivers/net/3c59x.c.
 
@@ -9357,11 +9485,13 @@ CONFIG_USB
   modems, and printers support the USB protocol and can be connected
   to the PC via those ports.
 
-  Say Y here if your computer has a USB port and you want to
-  use USB devices. You then need to say Y to at least one
-  of "UHCI support" or "OHCI support" below (the type of interface
-  that the USB hardware in your computer provides) and then choose
-  from among the drivers for USB peripherals.
+  Say Y here if your computer has a USB port and you want to use USB
+  devices. You then need to say Y to at least one of "UHCI support" or
+  "OHCI support" below (the type of interface that the USB hardware in
+  your computer provides to the operating system) and then choose from
+  among the drivers for USB peripherals. You may want to check out the
+  information provided in Documentation/usb/ and especially the links
+  given in Documentation/usb/usb-help.txt.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -9370,8 +9500,8 @@ CONFIG_USB
 
 USB verbose debug messages
 CONFIG_USB_DEBUG
-  Say Y here if you want the USB core drivers to produce a bunch of
-  debug messages to the system log. Select this if you are having a
+  Say Y here if you want the USB core & hub drivers to produce a bunch
+  of debug messages to the system log. Select this if you are having a
   problem with USB support and want to see more of what is going on.
 
 UHCI (intel PIIX4, VIA, ...) support?
@@ -9379,56 +9509,54 @@ CONFIG_USB_UHCI
   The Universal Host Controller Interface is a standard by Intel for
   accessing the USB hardware in the PC (which is also called the USB
   host controller). If your USB host controller conforms to this
-  standard, say Y. All recent boards with Intel PCI chipsets (like
-  intel 430TX, 440FX, 440LX, 440BX, i810, i820) conform to this standard.
-  Also all VIA PCI chipsets (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo
-  Pro II or Apollo Pro 133).
-  If unsure, say Y.
+  standard, you may want to say Y, but see below. All recent boards
+  with Intel PCI chipsets (like intel 430TX, 440FX, 440LX, 440BX,
+  i810, i820) conform to this standard. Also all VIA PCI chipsets
+  (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro
+  133).
+
+  Currently there exist two drivers for UHCI host controllers: this
+  one and the so-called JE driver, which you can get from 
+  "UHCI alternate (JE) support", below. You need only one.
 
   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 usb-uhci.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
-  
-USB-UHCI High Bandwidth support
-CONFIG_USB_UHCI_HIGH_BANDWIDTH
-  This option enables the so-called reclamation loop in usb-uhci, thus
-  allowing much higher transfer bandwidth for USB-bulk and control
-  messages; isochronous transfers (audio, video etc.) are not affected.
-  Due to a very simple design of the UHCI controller, this may cause
-  a significant PCI congestion under certain conditions. If you are
-  experiencing a system slowdown, disable this option.
-  
-  If unsure, say N.
-  
+
 UHCI (intel PIIX4, VIA, ...) alternate (JE) support?
 CONFIG_USB_UHCI_ALT
-  This is an alternate driver for UHCI support. It has been commonly
-  been referred to as the "JE driver".
-
   The Universal Host Controller Interface is a standard by Intel for
   accessing the USB hardware in the PC (which is also called the USB
   host controller). If your USB host controller conforms to this
-  standard, say Y. All recent boards with Intel PCI chipsets (like
-  intel 430TX, 440FX, 440LX, 440BX, i810, i820) conform to this standard.
-  Also all VIA PCI chipsets (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo
-  Pro II or Apollo Pro 133).
-  If unsure, say Y.
+  standard, you may want to say Y, but see below. All recent boards
+  with Intel PCI chipsets (like intel 430TX, 440FX, 440LX, 440BX,
+  i810, i820) conform to this standard. Also all VIA PCI chipsets
+  (like VIA VP2, VP3, MVP3, Apollo Pro, Apollo Pro II or Apollo Pro
+  133). If unsure, say Y.
+
+  Currently there exist two drivers for UHCI host controllers: this
+  so-called JE driver, and the one you get from "UHCI support", above.
+  You need only one.
 
   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 uhci.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
-  
-OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support?
+
+UHCI unlink optimizations (EXPERIMENTAL)
+CONFIG_USB_UHCI_ALT_UNLINK_OPTIMIZE
+  This option currently does nothing. You may say Y or N.
+
+OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support
 CONFIG_USB_OHCI
   The Open Host Controller Interface is a standard by
   Compaq/Microsoft/National for accessing the USB PC hardware (also
-  called USB host controller). If your USB host controller conforms
-  to this standard, say Y. The USB host controllers on most
-  non-Intel architectures and on several x86 compatibles with non-Intel
-  chipsets - like SiS (actual 610, 610 and so on) or ALi (ALi IV, ALi V,
-  Aladdin Pro..) - conform to this standard.
+  called USB host controller). If your USB host controller conforms to
+  this standard, say Y. The USB host controllers on most non-Intel
+  architectures and on several x86 compatibles with non-Intel chipsets
+  -- like SiS (aktual 610, 610 and so on) or ALi (ALi IV, ALi V,
+  Aladdin Pro..) -- conform to this standard.
 
   You may want to read the file Documentation/usb/ohci.txt.
 
@@ -9439,9 +9567,17 @@ CONFIG_USB_OHCI
 
 USB Human Interface Device (HID) support
 CONFIG_USB_HID
-  Say Y here if you want to connect a keyboard, mouse, joystick,
-  graphic tablet, UPS or any other HID based devices to your computer
-  via USB.
+  Say Y here if you want to connect keyboards, mice, joysticks,
+  graphic tablets, UPS's or any other HID based devices to your
+  computer via USB. More information is available:
+  Documentation/usb/input.txt.
+
+  If unsure, say Y.
+
+  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 hid.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
 
 USB HIDBP Keyboard support
 CONFIG_USB_KBD
@@ -9515,17 +9651,6 @@ CONFIG_INPUT_MOUSEDEV
   The module will be called mousedev.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Mix all mice into one device
-CONFIG_INPUT_MOUSEDEV_MIX
-  Say Y here if you want input from all your USB HID mice to be mixed
-  into one misc device. If you say N, you'll have a separate
-  device for each USB mouse.
-
-Support for digitizers
-CONFIG_INPUT_MOUSEDEV_DIGITIZER
-  Say Y here if you have a digitizer that doesn't emulate a mouse
-  itself, and want to use it as a mouse.
-
 Horizontal screen resolution
 CONFIG_INPUT_MOUSEDEV_SCREEN_X
   For the mouse emulation to be correct, the mousedev driver needs to
@@ -9578,6 +9703,7 @@ USB Modem (CDC ACM) support
 CONFIG_USB_ACM
   This driver supports USB modems and ISDN adapters which support the
   Communication Device Class Abstract Control Model interface.
+  Please read Documentation/usb/acm.txt for details.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -9623,26 +9749,35 @@ CONFIG_USB_SERIAL_VISOR
 USB FTDI Single Port Serial Driver
 CONFIG_USB_SERIAL_FTDI_SIO
   Say Y here if you want to use a FTDI SIO single port USB to serial
-  converter device. The implementation I have is called the USC-1000
+  converter device. The implementation I have is called the USC-1000.
 
-  See http://reality.sgi.com/bryder_wellington/ftdi_sio for more information 
-   on this driver and the device
+  See http://reality.sgi.com/bryder_wellington/ftdi_sio for more
+  information on this driver and the device.
 
-USB FTDI Single Port Serial Driver
+USB Keyspan PDA Single Port Serial Driver
 CONFIG_USB_SERIAL_KEYSPAN_PDA
-  Say Y here if you want to use a Keyspan PDA single port USB to serial
-  converter device.
+  Say Y here if you want to use a Keyspan PDA single port USB to
+  serial converter device.
+
+USB ZyXEL omni.net LCD Plus Driver
+CONFIG_USB_SERIAL_OMNINET
+  Say Y here if you want to use a ZyXEL omni.net LCD ISDN TA.
 
 USB Printer support
 CONFIG_USB_PRINTER
-  Say Y here if you want to connect a USB printer to your computer's USB
-  port.
+  Say Y here if you want to connect a USB printer to your computer's
+  USB port.
 
   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 printer.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
+USB Serial Converter verbose debug
+CONFIG_USB_SERIAL_DEBUG
+  Say Y here if you want verbose debug messages from the USB Serial
+  Converter. 
+
 USB IBM (Xirlink) C-It Camera support
 CONFIG_USB_IBMCAM
   Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -9710,13 +9845,12 @@ CONFIG_USB_DC2XX
   The module will be called dc2xx.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-
 USB Mustek MDC800 Digital Camera Support
 CONFIG_USB_MDC800
   Say Y here if you want to connect this type of still camera to
   your computer's USB port. This driver can be used with gphoto 0.4.3
-  and higher (look at www.gphoto.org).
-  To use it create a devicenode with mknod /dev/mustek c 180 32 and
+  and higher (look at http://www.gphoto.org ).
+  To use it create a device node with "mknod /dev/mustek c 10 171" and
   configure it in your software.
 
   This code is also available as a module ( = code which can be
@@ -9771,13 +9905,13 @@ USB device file system
 CONFIG_USB_DEVICEFS
   If you say Y here (and to "/proc file system support" below), you
   will get a file /proc/usb/devices which lists the devices currently
-  connected to your USB busses, a file /proc/usb/drivers file which
-  lists the USB kernel client drivers currently loaded, and for every
+  connected to your USB busses, a file /proc/usb/drivers which lists
+  the USB kernel client drivers currently loaded, and for every
   connected device a file named "/proc/usb/xxx/yyy", where xxx is the
   bus number and yyy the device number; the latter files can be used
-  by userspace drivers to talk to the device. These files are
-  "virtual", meaning they are generated on the fly and not stored on
-  the hard drive.
+  by user space programs to talk directly to the device. These files
+  are "virtual", meaning they are generated on the fly and not stored
+  on the hard drive.
   
   For the format of the /proc/usb/ files, please read
   Documentation/usb/proc_usb_info.txt. 
@@ -9939,8 +10073,33 @@ CONFIG_CRAMFS
   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 cramfs.o.
+  called cramfs.o. Note that the root file system (the one containing
+  the directory /) cannot be compiled as a module.
+
+  If unsure, say N.
    
+Simple RAM-based file system support
+CONFIG_RAMFS
+  Ramfs is a file system which keeps all files in RAM. It allows
+  read and write access.
+
+  In contrast to RAM disks, which get allocated a fixed amount of RAM,
+  ramfs grows and shrinks to accommodate the files it contains.
+
+  Before you can use this RAM-based file system, it has to be mounted,
+  meaning it has to be given a location in the directory hierarchy. If
+  you want to use the location /ramfiles for example, you would have
+  to create that directory first and then mount the file system by
+  saying "mount -t ramfs ramfs /ramfiles" or the equivalent line in
+  /etc/fstab. Everything is "virtual" in the sense that no files will
+  be created on your hard drive; if you reboot, everything in
+  /ramfiles will be lost.
+  
+  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 ramfs.o.
+
 ISO 9660 CDROM file system support
 CONFIG_ISO9660_FS
   This is the standard file system used on CDROMs. It was previously
@@ -10124,12 +10283,17 @@ CONFIG_PROC_FS
   (there is a small number of Interrupt ReQuest lines in your computer
   that are used by the attached devices to gain the CPU's attention --
   often a source of trouble if two devices are mistakenly configured
-  to use the same IRQ). 
+  to use the same IRQ). The program procinfo to display some
+  information about your system gathered from the /proc file system.
+
+  Before you can use the /proc file system, it has to be mounted,
+  meaning it has to be given a location in the directory hierarchy.
+  That location should be /proc. A command such as "mount -t proc proc
+  /proc" or the equivalent line in /etc/fstab does the job.
 
   The /proc file system is explained in the file
   Documentation/filesystems/proc.txt and on the proc(5) manpage ("man
-  5 proc"). You can also use the program procinfo to display some
-  information about your system gathered from the /proc file system.
+  5 proc").
 
   This option will enlarge your kernel by about 67 KB. Several
   programs depend on this, so everyone should say Y here.
@@ -10142,9 +10306,9 @@ CONFIG_DEVFS_FS
   allocations. Device drivers register entries in /dev which then
   appear automatically, which means that the system administrator does
   not have to create character and block special device files in the
-  /dev directory using the mknod command anymore.
+  /dev directory using the mknod command (or MAKEDEV script) anymore.
 
-  This is work in progress. If you want to use this you *must* read
+  This is work in progress. If you want to use this, you *must* read
   the material in Documentation/filesystems/devfs/, especially the
   file README there.
 
@@ -10193,6 +10357,13 @@ CONFIG_NFS_FS
 
   If you don't know what all this is about, say N.
 
+Provide NFSv3 client support (EXPERIMENTAL)
+CONFIG_NFS_V3
+  Say Y here if you want your NFS client to be able to speak the newer
+  version 3 of the NFS protocol. 
+ 
+  If unsure, say N.
+
 Root file system on NFS
 CONFIG_ROOT_NFS
   If you want your Linux box to mount its whole root file system (the
@@ -10219,6 +10390,10 @@ CONFIG_NFSD
   locations are given in the file Documentation/Changes in the NFS
   section.
 
+  If you say Y here, you will get support for version 2 of the NFS
+  protocol (NFSv2). If you also want NFSv3, say Y to the next question
+  as well.
+
   Please read the NFS-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto .
 
@@ -10265,7 +10440,7 @@ 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
-  enable this, back up your NTFS volume first since it may get
+  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.
@@ -10361,7 +10536,8 @@ CONFIG_ROMFS_FS
   which can be inserted in and removed from the running kernel
   whenever you want). The module is called romfs.o. If you want to
   compile it as a module, say M here and read
-  Documentation/modules.txt.
+  Documentation/modules.txt. Note that the file system of your root
+  partition (the one containing the directory /) cannot be a module.
 
   If you don't know whether you need it, then you don't need it:
   answer N.
@@ -10393,9 +10569,9 @@ CONFIG_AUTOFS_FS
   overhead in the already-mounted case; this is unlike the BSD
   automounter (amd), which is a pure user space daemon.
 
-  To use the automounter you need the user-space tools from
-  ftp://ftp.kernel.org/pub/linux/daemons/autofs ; you also want to
-  answer Y to "NFS file system support", below.
+  To use the automounter you need the user-space tools from the autofs
+  package; you can find the location in Documentation/Changes. You
+  also want to answer Y to "NFS file system support", below.
 
   If you want to use the newer version of the automounter with more
   features, say N here and say Y to "Kernel automounter v4 support",
@@ -10585,7 +10761,8 @@ CONFIG_DEVPTS_FS
 
   The GNU C library glibc 2.1 contains the requisite support for this
   mode of operation; you also need client programs that use the Unix98
-  API.
+  API. Please read Documentation/Changes for more information about
+  the Unix98 pty devices.
 
   Note that the experimental "/dev file system support"
   (CONFIG_DEVFS_FS)  is a more general facility.
@@ -12336,14 +12513,30 @@ WDT Watchdog timer
 CONFIG_WDT
   If you have a WDT500P or WDT501P watchdog board, say Y here,
   otherwise N. It is not possible to probe for this board, which means
-  that you have to set the IO port and IRQ it uses in the kernel
-  source at the top of drivers/char/wdt.c. 
+  that you have to inform the kernel about the IO port and IRQ using
+  the "wdt=" kernel option (try "man bootparam" or see the
+  documentation of your boot loader (lilo or loadlin) about how to
+  pass options to the kernel at boot time).
 
   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 wdt.o.
 
+WDT PCI Watchdog timer
+CONFIG_WDTPCI
+  If you have a PCI WDT500/501 watchdog board, say Y here,
+  otherwise N. It is not possible to probe for this board, which means
+  that you have to inform the kernel about the IO port and IRQ using
+  the "wdt=" kernel option (try "man bootparam" or see the
+  documentation of your boot loader (lilo or loadlin) about how to
+  pass options to the kernel at boot time).
+
+  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 wdt_pci.o.
+
 WDT501 features
 CONFIG_WDT_501
   Saying Y here and creating a character special file /dev/temperature
@@ -12836,9 +13029,9 @@ CONFIG_SOUND_OPL3SA1
 ProAudioSpectrum 16 support
 CONFIG_SOUND_PAS
   Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio
-  16 or Logitech SoundMan 16 sound card. Don't answer Y if you have
-  some other card made by Media Vision or Logitech since they are not
-  PAS16 compatible.
+  16 or Logitech SoundMan 16 sound card. Answer N if you have some
+  other card made by Media Vision or Logitech since those are not
+  PAS16 compatible. Please read Documentation/sound/PAS16.
 
   If you compile the driver into the kernel, you have to add
   "pas2=<io>,<irq>,<dma>,<dma2>,<sbio>,<sbirq>,<sbdma>,<sbdma2>
@@ -12854,12 +13047,12 @@ CONFIG_SOUND_SB
   Please read the file Documentation/sound/Soundblaster.
 
   You should also say Y here for cards based on the Avance Logic
-  ALS-007 chip (read Documentation/sound/ALS) and for cards based
-  on ESS chips (read Documentation/sound/ESS1868 and
+  ALS-007 and ALS-1X0 chips (read Documentation/sound/ALS) and for cards
+  based on ESS chips (read Documentation/sound/ESS1868 and
   Documentation/sound/ESS). If you have an SB AWE 32 or SB AWE 64, say
-  Y here and also to "Additional lowlevel drivers" and to "SB32/AWE
-  support" below and read Documentation/sound/INSTALL.awe. If you have
-  an IBM Mwave card, say Y here and read Documentation/sound/mwave.
+  Y here and also to "AWE32 synth" below and read 
+  Documentation/sound/INSTALL.awe. If you have an IBM Mwave card, say
+  Y here and read Documentation/sound/mwave.
 
   If you compile the driver into the kernel and don't want to use
   isapnp, you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel
@@ -13248,6 +13441,11 @@ CONFIG_AEDSP16_MPU401
   driver as a module you have to specify the MPU I/O base address with
   the parameter 'mpu_base=0xNNN'.
 
+Creative EMU10K1 based PCI sound cards
+CONFIG_SOUND_EMU10K1
+  Say Y or M if you have a PCI sound card using the EMU10K1
+  chipset, such as the Creative SBLive! or SB PCI512.
+
 Ensoniq ES1370 based PCI sound cards
 CONFIG_SOUND_ES1370
   Say Y or M if you have a PCI sound card utilizing the Ensoniq
@@ -13494,9 +13692,8 @@ CONFIG_HISAX_EURO
   Say Y or N according to the D-channel protocol which your local
   telephone service company provides.
 
-  NOTE: If you say Y here and you have only one ISDN card installed,
-  you cannot say Y to "HiSax Support for German 1TR6", below. And vice
-  versa.
+  The call control protocol E-DSS1 is used in most European countries.
+  If unsure, say yes.
 
 Support for german charge info
 CONFIG_DE_AOC
@@ -13527,9 +13724,9 @@ CONFIG_HISAX_1TR6
   Say Y or N according to the D-channel protocol which your local
   telephone service company provides.
 
-  NOTE: If you say Y here and you have only one ISDN card installed,
-  you cannot say Y to "HiSax Support for EURO/DSS1", above. And vice
-  versa.
+  1TR6 is an old call control protocol which was used in Germany
+  before E-DSS1 was established. Nowadays, all new lines in Germany
+  use E-DSS1.
 
 Teles 16.0/8.0
 CONFIG_HISAX_16_0
@@ -14932,6 +15129,35 @@ CONFIG_VIDEO_CQCAM
   as a module (c-qcam.o). Read Documentation/video4linux/CQcam.txt for
   more information.
 
+CPiA Video For Linux
+CONFIG_VIDEO_CPIA
+  This is the video4linux driver for cameras based on Vision's CPiA
+  (Colour Processor Interface ASIC), such as the Creative Labs Video
+  Blaster Webcam II. If you have one of these cameras, say Y here
+  and select parallel port and/or USB lowlevel support below,
+  otherwise say N. This will not work with the Creative Webcam III.
+  
+  Please read Documentation/video4linux/README.cpia for more
+  information.
+  
+  This driver is also available as a module (cpia.o).
+
+CPiA Parallel Port Lowlevel Support
+CONFIG_VIDEO_CPIA_PP
+  This is the lowlevel parallel port support for cameras based on
+  Vision's CPiA (Colour Processor Interface ASIC), such as the
+  Creative Webcam II. If you have the parallel port version of one
+  of these cameras, say Y here, otherwise say N. It is also available
+  as a module (cpia_pp.o).
+
+CPiA USB Lowlevel Support
+CONFIG_VIDEO_CPIA_USB
+  This is the lowlevel USB support for cameras based on Vision's CPiA
+  (Colour Processor Interface ASIC), such as the Creative Webcam II.
+  If you have the USB version of one of these cameras, say Y here,
+  otherwise say N. This will not work with the Creative Webcam III.
+  It is also available as a module (cpia_usb.o).
+
 Mediavision Pro Movie Studio Video For Linux
 CONFIG_VIDEO_PMS
   Say Y if you have such a thing. This driver is also available as a
@@ -15410,121 +15636,16 @@ CONFIG_BVME6000_SCC
   boards from BVM Ltd.  Everyone using one of these boards should say
   Y here.
 
-Support for user-space parallel port device drivers
-CONFIG_PPDEV
-  Saying Y to this adds support for /dev/parport device nodes.  This
-  is needed for programs that want portable access to the parallel
-  port, for instance deviceid (which displays Plug-and-Play device
-  IDs).
-
-  This is the parallel port equivalent of SCSI generic support (sg).
-  It is safe to say N to this -- it is not needed for normal printing
-  or parallel port CD-ROM/disk support.
-
-  This support is also available as a module. If you want to compile
-  it as a module, say M here and read Documentation/modules.txt. The
-  module will be called ppdev.o.
-
-  If unsure, say N.
-
-Kernel httpd acceleration (EXPERIMENTAL)
-CONFIG_KHTTPD
-  The kernel httpd acceleration daemon (kHTTPd) is a (limited) 
-  web server build into the kernel. It is limited since it can only
-  serve files from the file system. Saying "M" here builds the
-  kHTTPd module; this is NOT enough to have a working kHTTPd. 
-  For safety reasons, the module has to be activated by doing a
-  "echo 1 > /proc/sys/net/khttpd/start" after inserting the module.
-
-  Before using this, read the README in /usr/src/linux/net/khttpd !
-
-  The kHTTPd is experimental. Be careful when using it on a production
-  machine. Also note that kHTTPd doesn't support virtual servers yet.
-
-I2C support
-CONFIG_I2C
-  I2C (pronounce: I-square-C) is a slow bus protocol developed by
-  Philips. SMBus, or System Management Bus is a sub-protocol of I2C.
-
-  Both I2C and SMBus are supported here. You will need this for 
-  hardware sensors support, and in the future for Video for Linux
-  support.
-
-  Beside this option, you will also need to select specific drivers 
-  for your bus adapter(s). 
-
-I2C bit-banging interfaces
-CONFIG_I2C_ALGOBIT
-  This allows you to use a range of I2C adapters called bit-banging
-  adapters. Why they are called so is rather technical and uninteresting;
-  but you need to select this if you own one of the adapters listed
-  under it.
-
-Philips style parallel port adapter
-CONFIG_I2C_PHILIPSPAR
-  This supports parallel-port I2C adapters made by Philips. Unless you
-  own such an adapter, you do not need to select this.
-
-ELV adapter
-CONFIG_I2C_ELV
-  This supports parallel-port I2C adapters called ELV. Unless you 
-  own such an adapter, you do not need to select this.
-
-Velleman K9000 adapter
-CONFIG_I2C_VELLEMAN
-  This supports the Velleman K9000 parallel-port I2C adapter. Unless
-  you own such an adapter, you do not need to select this.
-
-I2C PCF 8584 interfaces
-CONFIG_I2C_ALGOPCF
-  This allows you to use a range of I2C adapters called PCF
-  adapters. Why they are called so is rather technical and uninteresting;
-  but you need to select this if you own one of the adapters listed
-  under it.
-
-Elektor ISA card
-CONFIG_I2C_ELEKTOR
-  This supports the PCF8584 ISA bus I2C adapter. Unless you own such
-  an adapter, you do not need to select this.
-
-I2C device interface
-CONFIG_I2C_CHARDEV
-  Here you find the drivers which allow you to use the i2c-* device 
-  files, usually found in the /dev directory on your system. They
-  make it possible to have user-space programs use the I2C bus.
-
-CPiA Video For Linux
-CONFIG_VIDEO_CPIA
-  This is the video4linux driver for cameras based on Vision's CPiA
-  (Colour Processor Interface ASIC), such as the Creative Labs Video
-  Blaster Webcam II. If you have one of these cameras, say Y here
-  and select parallel port and/or USB lowlevel support below,
-  otherwise say N. This will not work with the Creative Webcam III.
-  It is also available as a module (cpia.o).
-
-CPiA Parallel Port Lowlevel Support
-CONFIG_VIDEO_CPIA_PP
-  This is the lowlevel parallel port support for cameras based on
-  Vision's CPiA (Colour Processor Interface ASIC), such as the
-  Creative Webcam II. If you have the parallel port version of one
-  of these cameras, say Y here, otherwise say N. It is also available
-  as a module (cpia_pp.o).
-
-CPiA USB Lowlevel Support
-CONFIG_VIDEO_CPIA_USB
-  This is the lowlevel USB support for cameras based on Vision's CPiA
-  (Colour Processor Interface ASIC), such as the Creative Webcam II.
-  If you have the USB version of one of these cameras, say Y here,
-  otherwise say N. This will not work with the Creative Webcam III.
-  It is also available as a module (cpia_usb.o).
 
 #
 # A couple of things I keep forgetting:
 #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, 
-#               Intel, IRQ, Linux, MSDOS, NetWare, NetWinder, NFS, 
-#               PCI, SCSI, SPARC
-#   two words:  hard drive, hard disk, sound card, home page
-#   other:      it's safe to save; daemon; use --, not - or ---
+#               Intel, IRQ, ISDN, Linux, MSDOS, NetWare, NetWinder, 
+#               NFS, PCI, SCSI, SPARC
+#   two words:  file system, hard drive, hard disk, home page, 
+#               user space, web site
+#   other:      it's safe to save; daemon; use --, not - or ---;
+#               use KB for 1024 bytes, not kB or K.
 #
 #
 # This is used by Emacs' spell checker ispell.el:
@@ -15655,7 +15776,7 @@ ICN EDSS Cisco
 # LocalWords:  caldera Preload Preloading slowdowns schoebel uni NBD nbd prog
 # LocalWords:  stuttgart rdist TRANS hostnames mango jukeboxes ESS userland PD
 # LocalWords:  hardlinked NAMETRANS env mtab fstab umount nologin runlevel gid
-# LocalWords:  filespace adm Nodename hostname uname Kernelname bootp nmi DI OV
+# LocalWords:  adm Nodename hostname uname Kernelname bootp nmi DI OV StegFS
 # LocalWords:  KERNNAME kname ktype kernelname Kerneltype KERNTYPE Alt RX mdafb
 # LocalWords:  dataless kerneltype SYSNAME Comtrol Rocketport palmtop fbset EGS
 # LocalWords:  nvram SYSRQ SysRq PrintScreen sysrq NVRAMs NvRAM Shortwave RTTY
@@ -15803,7 +15924,7 @@ ICN EDSS Cisco
 # LocalWords:  Diffserv DSMARK Ingress Qdisc TCINDEX TMSPCI tmspci Ringode JE
 # LocalWords:  MADGEMC madgemc TokenRing SMCTR TokenCard smctr Wacom Graphire
 # LocalWords:  WMFORCE mousedev ConnectTech HandSpring Xirlink IBMCAM ibmcam SN
-# LocalWords:  DEVICEFS yyy userspace Cymraeg Dwave SIMM JSFLASH JavaStation's
+# LocalWords:  DEVICEFS yyy Cymraeg Dwave SIMM JSFLASH JavaStation's multilink
 # LocalWords:  nsc ircc DDB Vrc CMN TB PROMs Vino rivafb DDC Matroxes MGA TVO
 # LocalWords:  MAVEN fbdev crtc maven matroxset NTSC PCA SBA AAL SKFP DAS SAS
 # LocalWords:  skfp Intuos ADMtek's pegasus PLUSB plusb pointopoint mp rio Xeon
@@ -15828,4 +15949,7 @@ ICN EDSS Cisco
 # LocalWords:  UltraDMA WDC CRC CONNTRACK IPTABLES iptables nfmark interface's
 # LocalWords:  tdfxfb TNTx HGA hgafb VERBOSEDEBUG SunTrunking SunSoft XIRTULIP
 # LocalWords:  ethercards PNIC Macronix MXIC ASIX xircom Mustek MDC gphoto mdc
-# LocalWords:  CramFs Cramfs uid cramfs AVM's kernelcapi PCIV
+# LocalWords:  CramFs Cramfs uid cramfs AVM's kernelcapi PCIV cdrdao Cdparanoia
+# LocalWords:  DMX Domex dmx wellington ftdi sio Accton Billington Corega FEter
+# LocalWords:  MELCO LUA PNA Linksys SNC chkdsk AWACS Webcam RAMFS Ramfs ramfs
+# LocalWords:  ramfiles MAKEDEV pty WDTPCI APA apa
diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt
index 14237b851..443d07be8 100644
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
@@ -198,7 +198,7 @@ One should provide the exact DMA direction if you know it.
 PCI_DMA_TODEVICE means "from main memory to the PCI device"
 PCI_DMA_FROMDEVICE means "from the PCI device to main memory"
 
-Cou are _strongly_ encouraged to specify this as precisely
+You are _strongly_ encouraged to specify this as precisely
 as you possibly can.
 
 If you absolutely cannot know the direction of the DMA transfer,
@@ -284,7 +284,7 @@ accessed sg->address and sg->length as shown above.
 
 To unmap a scatterlist, just call:
 
-	pci_unmap_sg(dev, sglist, nents);
+	pci_unmap_sg(dev, sglist, nents, direction);
 
 Again, make sure DMA activity finished.
 
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 1b1ce265b..2079bae18 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -3,13 +3,22 @@ BOOKS	:= wanbook.sgml z8530book.sgml mcabook.sgml videobook.sgml kernel-api.sgml
 PS	:=	$(patsubst %.sgml, %.ps, $(BOOKS))
 PDF	:=	$(patsubst %.sgml, %.pdf, $(BOOKS))
 
-books:	docproc $(BOOKS)
+$(BOOKS): $(TOPDIR)/scripts/docproc
+
+.PHONY:	books ps pdf clean mrproper db2ps db2pdf
+
+books:	$(BOOKS)
 
 ps:	$(PS)
 
 pdf:	$(PDF)
 
-docproc:
+db2ps db2pdf:
+	@(which $@ > /dev/null 2>&1) || \
+	 (echo "*** You need to install DocBook stylesheets ***"; \
+	  exit 1)
+
+$(TOPDIR)/scripts/docproc:
 	$(MAKE) -C $(TOPDIR)/scripts docproc
 
 wanbook.sgml: wanbook.tmpl
@@ -64,7 +73,7 @@ clean:
 mrproper: clean
 	$(RM) $(PS) $(PDF)
 
-%.ps : %.sgml
+%.ps : %.sgml db2ps
 	db2ps $<
 
 %.pdf : %.sgml
diff --git a/Documentation/arm/Setup b/Documentation/arm/Setup
index 44aa9bc1b..68ff38daa 100644
--- a/Documentation/arm/Setup
+++ b/Documentation/arm/Setup
@@ -112,6 +112,14 @@ below:
 
    system 64-bit serial number
 
+ mem_fclk_21285
+
+   The speed of the external oscillator to the 21285 (footbridge),
+   which control's the speed of the memory bus, timer & serial port.
+   Depending upon the speed of the cpu its value can be between
+   0-66 MHz. If no params are passed or a value of zero is passed,
+   then a value of 50 Mhz is the default on 21285 architectures.
+
  paths[8][128]
 
    These are now obsolete, and should not be used.
diff --git a/Documentation/computone.txt b/Documentation/computone.txt
index 65937a736..444d0c4f4 100644
--- a/Documentation/computone.txt
+++ b/Documentation/computone.txt
@@ -6,12 +6,12 @@ Release Notes For Linux Kernel 2.2 and higher.
 These notes are for the drivers which have already been integrated into the
 kernel and have been tested on Linux kernels 2.0, 2.2, and 2.3.
 
-Version: 1.2.4
-Date: 12/15/99
+Version: 1.2.9
+Date: 04/12/2000
 Author: Andrew Manison <amanison@america.net>
 Testing: larryg@computone.com
 Support: support@computone.com
-Fixes and Updates: Doug McNash <dmcnash@computone.com>
+Fixes and Updates: Doug McNash <dougm@computone.com>
 Proc Filesystem and Kernel Integration: Mike Warfield <mhw@wittsend.com>
 
 
@@ -28,7 +28,7 @@ with the exception of the MicroChannel controllers.  It does not support
 products previous to the Intelliport II.
 
 This driver was developed on the v2.0.x Linux tree and has been tested up
-to v2.2.13; it will probably not work with earlier v1.X kernels,.
+to v2.2.14; it will probably not work with earlier v1.X kernels,.
 
 
 2. QUICK INSTALLATION
@@ -43,49 +43,48 @@ Hardware - If you have an ISA card, find a free interrupt and io port.
 
 	Note the hardware address from the Computone ISA cards installed into
 		the system.  These are required for editing ip2.h or editing
-		/etc/config.modules, or for specification on the modprobe
+		/etc/modules.conf, or for specification on the modprobe
 		command line.
 
+	Note that the /etc/modules.conf file is named /etc/conf.modules
+		with older versions of the module utilities.
+
 Software -
 
 Module installation:
 
-a) Obtain driver-kernel patch file
-b) Copy to the linux source tree root, Run ip2build (if not patch)
-c) Determine free irq/address to use if any (configure BIOS if need be)
-d) Run "make config" or "make menuconfig" or "make xconfig"
+a) Determine free irq/address to use if any (configure BIOS if need be)
+b) Run "make config" or "make menuconfig" or "make xconfig"
    Select (m) module for CONFIG_COMPUTONE under character
    devices.  CONFIG_PCI and CONFIG_MODULES also may need to be set.
-e) Set address on ISA cards then:
+c) Set address on ISA cards then:
    edit /usr/src/linux/drivers/char/ip2/ip2.h if needed 
 	or
    edit /etc/modules.conf if needed (module).
 	or both to match this setting.
-f) Run "make dep"
-g) Run "make modules"
-h) Run "make modules_install"
-i) Run "/sbin/depmod -a"
-j) install driver using `modprobe ip2 <options>` (options listed below)
-k) run ip2mkdev (either the script below or the binary version)
+d) Run "make dep"
+e) Run "make modules"
+f) Run "make modules_install"
+g) Run "/sbin/depmod -a"
+h) install driver using `modprobe ip2 <options>` (options listed below)
+i) run ip2mkdev (either the script below or the binary version)
 
 
 Kernel installation:
 
-a) Obtain driver-kernel patch file
-b) Copy to the linux source tree root, Run ip2build (if not patch)
-c) Determine free irq/address to use if any (configure BIOS if need be)
-d) Run "make config" or "make menuconfig" or "make xconfig"
+a) Determine free irq/address to use if any (configure BIOS if need be)
+b) Run "make config" or "make menuconfig" or "make xconfig"
    Select (y) kernel for CONFIG_COMPUTONE under character
    devices.  CONFIG_PCI may need to be set if you have PCI bus.
-e) Set address on ISA cards then:
+c) Set address on ISA cards then:
 	   edit /usr/src/linux/drivers/char/ip2/ip2.h  
-f) Run "make dep"
-g) Run "make zImage" or whatever target you prefer.
-h) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
-i) Add new config for this kernel into /etc/lilo.conf, run "lilo"
+d) Run "make dep"
+e) Run "make zImage" or whatever target you prefer.
+f) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
+g) Add new config for this kernel into /etc/lilo.conf, run "lilo"
 	or copy to a floppy disk and boot from that floppy disk.
-j) Reboot using this kernel
-k) run ip2mkdev (either the script below or the binary version)
+h) Reboot using this kernel
+i) run ip2mkdev (either the script below or the binary version)
 
 
 3. INSTALLATION
@@ -162,6 +161,22 @@ boxes this will leave gaps in the sequence of device names. ip2mkdev uses
 Linux tty naming conventions: ttyF0 - ttyF255 for normal devices, and
 cuf0 - cuf255 for callout devices.
 
+If you are using devfs, existing devices are automatically created within
+the devfs name space.  Normal devices will be ttf/0 - ttf/255 and callout
+devices will be cuf/0 - cuf/255.  With devfs installed, ip2mkdev will
+create symbolic links in /dev from the old conventional names to the newer
+devfs names as follows:
+
+	/dev/ip2ipl[n]	-> /dev/ip2/ipl[n]	n = 0 - 3
+	/dev/ip2stat[n]	-> /dev/ip2/stat[n]	n = 0 - 3
+	/dev/ttyF[n]	-> /dev/ttf/[n]		n = 0 - 255
+	/dev/cuf[n]	-> /dev/cuf/[n]		n = 0 - 255
+
+Only devices for existing ports and boards will be created.
+
+You do not need to run ip2mkdev if you are using devfs and only want to
+use the devfs native device names.
+
 
 4. USING THE DRIVERS
 
@@ -195,14 +210,49 @@ cut out and run as "ip2mkdev" to create the necessary device files.  To
 use the ip2mkdev script, you must have procfs enabled and the proc file
 system mounted on /proc.
 
-6. NOTES
+You do not need to run ip2mkdev if you are using devfs and only want to
+use the devfs native device names.
+
+
+6. DEVFS
+
+DEVFS is the DEVice File System available as an add on package for the
+2.2.x kernels and available as a configuration option in 2.3.46 and higher.
+Devfs allows for the automatic creation and management of device names
+under control of the device drivers themselves.  The Devfs namespace is
+hierarchial and reduces the clutter present in the normal flat /dev
+namespace.  Devfs names and conventional device names may be intermixed.
+A userspace daemon, devfsd, exists to allow for automatic creation and
+management of symbolic links from the devfs name space to the conventional
+names.  More details on devfs can be found on the DEVFS home site at
+<http://www.atnf.csiro.au/~rgooch/linux/> or in the file kernel
+documenation files, .../linux/Documenation/filesystems/devfs/REAME.
+
+If you are using devfs, existing devices are automatically created within
+the devfs name space.  Normal devices will be ttf/0 - ttf/255 and callout
+devices will be cuf/0 - cuf/255.  With devfs installed, ip2mkdev will
+create symbolic links in /dev from the old conventional names to the newer
+devfs names as follows:
+
+	/dev/ip2ipl[n]	-> /dev/ip2/ipl[n]	n = 0 - 3
+	/dev/ip2stat[n]	-> /dev/ip2/stat[n]	n = 0 - 3
+	/dev/ttyF[n]	-> /dev/ttf/[n]		n = 0 - 255
+	/dev/cuf[n]	-> /dev/cuf/[n]		n = 0 - 255
+
+Only devices for existing ports and boards will be created.
+
+You do not need to run ip2mkdev if you are using devfs and only want to
+use the devfs native device names.
+ 
+
+7. NOTES
 
 This is a release version of the driver, but it is impossible to test it
 in all configurations of Linux. If there is any anomalous behaviour that 
 does not match the standard serial port's behaviour please let us know.
 
 
-7. ip2mkdev shell script
+8. ip2mkdev shell script
 
 Previously, this script was simply attached here.  It is now attached as a
 shar archive to make it easier to extract the script from the documentation.
@@ -223,15 +273,15 @@ are present on you system at the time it is run.
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 1999-12-17 16:06 EST by <root@alcove.wittsend.com>.
-# Source directory was `/mnt2/src/linux-2.3.33/Documentation'.
+# Made on 2000-03-10 11:55 EST by <root@wittsend.wittsend.com>.
+# Source directory was `/mnt1/src/linux-2.3.50c/Documentation'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
 #
 # This shar contains:
 # length mode       name
 # ------ ---------- ------------------------------------------
-#   3300 -rwxr-xr-x ip2mkdev
+#   4061 -rwxr-xr-x ip2mkdev
 #
 save_IFS="${IFS}"
 IFS="${IFS}:"
@@ -278,7 +328,7 @@ else
 fi
 rm -f 1231235999 $$.touch
 #
-if mkdir _sh06360; then
+if mkdir _sh17088; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -291,7 +341,7 @@ else
   $echo 'x -' extracting 'ip2mkdev' '(text)'
   sed 's/^X//' << 'SHAR_EOF' > 'ip2mkdev' &&
 #!/bin/sh -
-X
+#
 #	ip2mkdev
 #
 #	Make or remove devices as needed for Computone Intelliport drivers
@@ -300,16 +350,48 @@ X
 #	with it.  That prevents us from screwing up open ttys, ownership
 #	and permissions on a running system!
 #
-#	This script will NOT remove devices that no longer exist because
-#	their board or interface box has been removed.  If you want to get
-#	rid of them, you can manually do an "rm -f /dev/ttyF* /dev/cuaf*"
-#	before running this script, which will then recreate all the valid
-#	devices
+#	This script will NOT remove devices that no longer exist if their
+#	board or interface box has been removed.  If you want to get rid
+#	of them, you can manually do an "rm -f /dev/ttyF* /dev/cuaf*"
+#	before running this script.  Running this script will then recreate
+#	all the valid devices.
 #
 #	=mhw=
 #	Michael H. Warfield
 #	mhw@wittsend.com
 #
+#	Updated 03/09/2000 for devfs support in ip2 drivers. =mhw=
+#
+X
+if test -d /dev/ip2 ; then
+#	This is devfs mode...  We don't do anything except create symlinks
+#	from the real devices to the old names!
+X	cd /dev
+X	echo "Creating symbolic links to devfs devices"
+X	for i in `ls ip2` ; do
+X		if test ! -L ip2$i ; then
+X			# Remove it incase it wasn't a symlink (old device)
+X			rm -f ip2$i
+X			ln -s ip2/$i ip2$i
+X		fi
+X	done
+X	for i in `ls ttf` ; do
+X		if test ! -L ttyF$i ; then
+X			# Remove it incase it wasn't a symlink (old device)
+X			rm -f ttyF$i
+X			ln -s ttyf/$i ttyF$i
+X		fi
+X	done
+X	for i in `ls cuf` ; do
+X		if test ! -L cuf$i ; then
+X			# Remove it incase it wasn't a symlink (old device)
+X			rm -f cuf$i
+X			ln -s cuf/$i cuf$i
+X		fi
+X	done
+X	exit 0
+fi
+X
 if test ! -f /proc/tty/drivers
 then
 X	echo "\
@@ -344,8 +426,8 @@ X
 # Ok...  So we got the driver loaded and we can locate the procfs files.
 # Next we need our major numbers.
 X
-TTYMAJOR=`sed -e '/^ip2/!d' -e '/\/dev\/tty/!d' -e 's/.*tty.[ 	]*\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/drivers`
-CUAMAJOR=`sed -e '/^ip2/!d' -e '/\/dev\/cu/!d' -e 's/.*cu.[ 	]*\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/drivers`
+TTYMAJOR=`sed -e '/^ip2/!d' -e '/\/dev\/tt/!d' -e 's/.*tt[^ 	]*[ 	]*\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/drivers`
+CUAMAJOR=`sed -e '/^ip2/!d' -e '/\/dev\/cu/!d' -e 's/.*cu[^ 	]*[ 	]*\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/drivers`
 BRDMAJOR=`sed -e '/^Driver: /!d' -e 's/.*IMajor=\([0-9]*\)[ 	]*.*/\1/' < /proc/tty/driver/ip2`
 X
 echo "\
@@ -426,20 +508,20 @@ done
 X
 Xexit 0
 SHAR_EOF
-  $shar_touch -am 1217160599 'ip2mkdev' &&
+  $shar_touch -am 03101153100 'ip2mkdev' &&
   chmod 0755 'ip2mkdev' ||
   $echo 'restore of' 'ip2mkdev' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'ip2mkdev:' 'MD5 check failed'
-eccd181f4a2005e47a969fc83885df61  ip2mkdev
+b0671abeba07b0a9266b70aaf24509b3  ip2mkdev
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'ip2mkdev'`"
-    test 3300 -eq "$shar_count" ||
-    $echo 'ip2mkdev:' 'original size' '3300,' 'current size' "$shar_count!"
+    test 4061 -eq "$shar_count" ||
+    $echo 'ip2mkdev:' 'original size' '4061,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh06360
+rm -fr _sh17088
 exit 0
diff --git a/Documentation/fb/tgafb.txt b/Documentation/fb/tgafb.txt
index 36fe07821..1fe34cf52 100644
--- a/Documentation/fb/tgafb.txt
+++ b/Documentation/fb/tgafb.txt
@@ -1,25 +1,35 @@
-[Also cloned from vesafb.txt, thanks to Gerd]
+$Id: tgafb.txt,v 1.1.2.2 2000/04/04 06:50:18 mato Exp $
 
 What is tgafb?
 ===============
 
 This is a driver for DECChip 21030 based graphics framebuffers, a.k.a. TGA
-cards, specifically the following models
+cards, which are usually found in older Digital Alpha systems. The
+following models are supported:
 
-ZLxP-E1 (8bpp, 4 MB VRAM)
+ZLxP-E1 (8bpp, 2 MB VRAM)
 ZLxP-E2 (32bpp, 8 MB VRAM)
 ZLxP-E3 (32bpp, 16 MB VRAM, Zbuffer)
 
-This version, tgafb-1.12, is almost a complete rewrite of the code written
-by Geert Uytterhoeven, which was based on the original TGA console code
-written by Jay Estabrook.
+This version is an almost complete rewrite of the code written by Geert
+Uytterhoeven, which was based on the original TGA console code written by
+Jay Estabrook.
 
-Major new features:
+Major new features since Linux 2.0.x:
 
- * Support for multiple resolutions, including setting the resolution at
-   boot time, allowing the use of a fixed-frequency monitor.
- * Complete code rewrite to follow Geert's skeletonfb spec which will allow
-   future implementation of hardware acceleration and other features.
+ * Support for multiple resolutions
+ * Support for fixed-frequency and other oddball monitors 
+   (by allowing the video mode to be set at boot time)
+
+User-visible changes since Linux 2.2.x:
+
+ * Sync-on-green is now handled properly
+ * More useful information is printed on bootup
+   (this helps if people run into problems)
+
+This driver does not (yet) support the TGA2 family of framebuffers, so the
+PowerStorm 3D30/4D20 (also known as PBXGB) cards are not supported. These
+can however be used with the standard VGA Text Console driver.
 
 
 Configuration
@@ -32,19 +42,27 @@ Accepted options:
 
 font:X    - default font to use. All fonts are supported, including the
             SUN12x22 font which is very nice at high resolutions.
-mode:X    - default video mode. See drivers/video/tgafb.c for a list.
-            
-X11
-===
-
-XF68_FBDev should work just fine, but I haven't tested it.  Running
-the XF86_TGA server (reasonably recent versions of which support all TGA
-cards) works fine for me.
-
-One minor problem with XF86_TGA is when running tgafb in resolutions higher
-than 640x480, on switching VCs from tgafb to X, the entire screen is not
-re-drawn and must be manually refreshed. This is an X server problem, not a
-tgafb problem.
+
+mode:X    - default video mode. The following video modes are supported:
+            640x480-60, 800x600-56, 640x480-72, 800x600-60, 800x600-72, 
+	    1024x768-60, 1152x864-60, 1024x768-70, 1024x768-76,
+	    1152x864-70, 1280x1024-61, 1024x768-85, 1280x1024-70,
+	    1152x864-84, 1280x1024-76, 1280x1024-85
+ 
+
+Known Issues
+============
+
+The XFree86 FBDev server has been reported not to work, since tgafb doesn't do
+mmap(). Running the standard XF86_TGA server from XFree86 3.3.x works fine for
+me, however this server does not do acceleration, which make certain operations
+quite slow. Support for acceleration is being progressively integrated in
+XFree86 4.x.
+
+When running tgafb in resolutions higher than 640x480, on switching VCs from
+tgafb to XF86_TGA 3.3.x, the entire screen is not re-drawn and must be manually
+refreshed. This is an X server problem, not a tgafb problem, and is fixed in
+XFree86 4.0.
 
 Enjoy!
 
diff --git a/Documentation/filesystems/devfs/ChangeLog b/Documentation/filesystems/devfs/ChangeLog
index 2b8a0d2f0..96a358602 100644
--- a/Documentation/filesystems/devfs/ChangeLog
+++ b/Documentation/filesystems/devfs/ChangeLog
@@ -1480,3 +1480,19 @@ Work sponsored by SGI
   <devfs_readdir>
 
 - Only set auto-ownership for /dev/pty/s*
+===============================================================================
+Changes for patch v162
+
+Work sponsored by SGI
+
+- Set inode->i_size to correct size for symlinks
+  Thanks to Jeremy Fitzhardinge <jeremy@goop.org>
+
+- Only give lookup() method to directories to comply with new VFS
+  assumptions
+
+- Remove unnecessary tests in symlink methods
+
+- Don't kill existing block ops in <devfs_read_inode>
+
+- Restore auto-ownership for /dev/pty/m*
diff --git a/Documentation/filesystems/devfs/modules.conf b/Documentation/filesystems/devfs/modules.conf
index 273568c3f..43bae68ec 100644
--- a/Documentation/filesystems/devfs/modules.conf
+++ b/Documentation/filesystems/devfs/modules.conf
@@ -38,7 +38,7 @@ alias		/dev/sr*	/dev/sr
 
 # SCSI tapes
 probeall	/dev/st		scsi-hosts st
-alias		/dev/st*	/dev/sr
+alias		/dev/st*	/dev/st
 alias		/dev/nst*	/dev/st
 
 # SCSI generic
diff --git a/Documentation/ia64/efirtc.txt b/Documentation/ia64/efirtc.txt
new file mode 100644
index 000000000..b0c62765c
--- /dev/null
+++ b/Documentation/ia64/efirtc.txt
@@ -0,0 +1,128 @@
+EFI Real Time Clock driver
+-------------------------------
+S. Eranian <eranian@hpl.hp.com>
+March 2000
+
+I/ Introduction
+
+This document describes the efirtc.c driver has provided for
+the IA-64 platform. 
+
+The purpose of this driver is to supply an API for kernel and user applications
+to get access to the Time Service offered by EFI version 0.92.
+
+EFI provides 4 calls one can make once the OS is booted: GetTime(),
+SetTime(), GetWakeupTime(), SetWakeupTime() which are all supported by this driver.
+We describes those calls as well the the design of the driver in the following
+sections.
+
+II/ Design Decisions
+
+The original ideas was to provide a very simple  driver to get access to, 
+at first, the time of day service. This is required in order to access, in a 
+portable way, the CMOS clock. A program like /sbin/hwclock uses such a clock 
+to initialize the system view of the time during boot.
+
+Because we wanted to minimize the impact on existing user-level apps using
+the CMOS clock, we decided to expose an API that was very similar to the one
+used today with the legacy RTC driver (driver/char/rtc.c). However, because 
+EFI provides a simpler services, not all all ioctl() are available. Also
+new ioctl()s have been introduced for things that EFI provides but not the 
+legacy.
+
+EFI uses a slightly different way of representing the time, noticeably
+the reference date is different. Year is the using the full 4-digit format.
+The Epoch is January 1st 1998. For backward compatibility reasons we don't
+expose this new way of representing time. Instead we use something very 
+similar to the struct tm, i.e. struct rtc_time, as used by hwclock.
+One of the reasons for doing it this way is to allow for EFI to still evolve
+without necessarily impatcing any of the user applications. The decoupling
+enables flexibility and permits writing wrapper code is ncase things change.
+
+The driver exposes two interfaces, one via the device file and a set of ioctl()s.
+The other is read-only via the /proc filesystem. 
+
+As of today we don't offer a /proc/sys interface.
+
+To allow for a uniform interface between the legacy RTC and EFI time service,
+we have created the include/linux/rtc.h header file to contain only the 
+"public" API of the two drivers.  The specifics of the legacy RTC are still 
+in include/linux/mc146818rtc.h.
+
+ 
+III/ Time of day service
+
+The part of the driver gives access to the time of day service of EFI.
+Two ioctl()s, compatible with the legacy RTC calls:
+
+	Read the CMOS clock: ioctl(d, RTC_RD_TIME, &rtc);
+
+	Write the CMOS clock: ioctl(d, RTC_SET_TIME, &rtc);
+
+The rtc is a pointer to a data structure defined in rtc.h which is close
+to a struct tm:
+
+struct rtc_time {
+        int tm_sec;
+        int tm_min;
+        int tm_hour;
+        int tm_mday;
+        int tm_mon;
+        int tm_year;
+        int tm_wday;
+        int tm_yday;
+        int tm_isdst;
+};
+
+The driver takes care of converting back an forth between the EFI time and
+this format.
+
+Those two ioctl()s can be exercised with the hwclock command:
+
+For reading:
+# /sbin/hwclock --show
+Mon Mar  6 15:32:32 2000  -0.910248 seconds
+
+For setting:
+# /sbin/hwclock --systohc
+
+Root privileges are required to be able to set the time of day.
+
+IV/ Wakeup Alarm service
+
+EFI provides an API by which one can program when a machine should wakeup,
+i.e. reboot. This is very different from the alarm provided by the legacy
+RTC which is some kind of interval timer alarm. For this reason we don't use
+the same ioctl()s to get access to the service. Instead we have
+introduced 2 news ioctl()s to the interface of an RTC. 
+
+We have added 2 new ioctl()s that are specific to the EFI driver:
+
+	Read the current state of the alarm
+	ioctl(d, RTC_WKLAM_RD, &wkt)
+
+	Set the alarm or change its status
+	ioctl(d, RTC_WKALM_SET, &wkt)
+
+The wkt structure encapsulates a struct rtc_time + 2 extra fields to get 
+status information:
+	
+struct rtc_wkalrm {
+
+        unsigned char enabled; /* =1 if alarm is enabled */
+        unsigned char pending; /* =1 if alarm is pending  */
+
+        struct rtc_time time;
+} 
+
+As of today, none of the existing user-level apps supports this feature.
+However writing such a program should be hard by simply using those two 
+ioctl(). 
+
+Root privileges are required to be able to set the alarm.
+
+V/ References.
+
+Checkout the following Web site for more information on EFI:
+
+http://developer.intel.com/technology/efi/
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 29a11c3a8..bb8e3ee46 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -28,8 +28,9 @@ patch to Linus Torvalds.  Or you can e-mail me at <mec@shout.net> and
 I'll register one for you.
 
 The second argument to _IO, _IOW, _IOR, or _IOWR is a sequence number
-to distinguish ioctls from each other.  The third argument is the size
-of the structure going into the kernel or coming out of the kernel.
+to distinguish ioctls from each other.  The third argument to _IOW,
+_IOR, or _IOWR is the type of the data going into the kernel or coming
+out of the kernel (e.g.  'int' or 'struct foo').
 
 Some devices use their major number as the identifier; this is OK, as
 long as it is unique.  Some devices are irregular and don't follow any
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index 8f76009c5..82c007564 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -164,6 +164,18 @@
        different situations. We also investigate the complex topic of
        DMA".
        
+     * Title: "Device Drivers Concluded"
+       Author: Georg v. Zezschwitz.
+       URL: http://www2.linuxjournal.com/lj-issues/issue28/1287.html
+       Keywords: address spaces, pages, pagination, page management,
+       demand loading, swapping, memory protection, memory mapping, mmap,
+       virtual memory areas (VMAs), vremap, PCI.
+       Description: Finally, the above turned out into a five articles
+       series. This latest one's introduction reads: "This is the last of
+       five articles about character device drivers. In this final
+       section, Georg deals with memory mapping devices, beginning with
+       an overall description of the Linux memory management concepts".
+       
      * Title: "Network Buffers And Memory Management"
        Author: Alan Cox.
        URL: http://www.ssc.com/lj/issue30/kk30.html
@@ -234,11 +246,26 @@
        Description: 68 pages paper on writing character drivers. A little
        bit old (1.993, 1.994) although still useful.
        
+     * Title: "Design and Implementation of the Second Extended
+       Filesystem"
+       Author: Rémy Card, Theodore Ts'o, Stephen Tweedie.
+       URL: http://web.mit.edu/tytso/www/linux/ext2intro.html
+       Keywords: ext2, linux fs history, inode, directory, link, devices,
+       VFS, physical structure, performance, benchmarks, ext2fs library,
+       ext2fs tools, e2fsck.
+       Description: Paper written by three of the top ext2 hackers.
+       Covers Linux filesystems history, ext2 motivation, ext2 features,
+       design, physical structure on disk, performance, benchmarks,
+       e2fsck's passes description... A must read!
+       Notes: This paper was first published in the Proceedings of the
+       First Dutch International Symposium on Linux, ISBN 90-367-0385-9.
+       
      * Title: "The Second Extended Filesystem"
        Author: Matthew Wilcox.
        URL: http://pocket.fluff.org/~mrw/linux/ext2.txt
        Keywords: ext2, filesystem.
-       Description: Description of ext2's blocks, directories, inodes ...
+       Description: Description of ext2's blocks, directories, inodes...
+       Notes: Seems to be DOWN. Anyone knows another link for it?
        
      * Title: "Analysis of the Ext2fs structure"
        Author: Louis-Dominique Dubeau.
@@ -247,6 +274,15 @@
        Description: Description of ext2's blocks, directories, inodes,
        bitmaps, invariants ...
        
+     * Title: "Journaling the Linux ext2fs Filesystem"
+       Author: Stephen C. Tweedie.
+       URL:
+       ftp://ftp.uk.linux.org:/pub/linux/sct/fs/jfs/journal-design.ps.gz
+       Keywords: ext3, journalist.
+       Description: Excellent 8-pages paper explaining the journaling
+       capabilities added to ext2 by the author, showing different
+       problems faced and the alternatives chosen.
+       
      * Title: "Kernel API changes from 2.0 to 2.2"
        Author: Richard Gooch.
        URL:
@@ -258,7 +294,7 @@
      * Title: "Kernel API changes from 2.2 to 2.3"
        Author: Richard Gooch.
        URL:
-       http://www.atnf.csiro.au/~rgooch/linux/docs/porting-to-2.2.html
+       http://www.atnf.csiro.au/~rgooch/linux/docs/porting-to-2.3.html
        Keywords: 2.3, changes.
        Description: Kernel functions/structures/variables which changed
        from 2.2.x to 2.3.x.
@@ -295,6 +331,81 @@
        want a mechanism that is scalable. This means a large number of
        inactive FDs cost very little in memory and CPU time to manage".
        
+     * Title: "The Kernel Hacking HOWTO"
+       Author: Various Talented People, and Rusty.
+       URL: http://www.samba.org/~netfilter/kernel-hacking-HOWTO.html
+       Keywords: HOWTO, kernel contexts, deadlock, locking, modules,
+       symbols, return conventions.
+       Description: From the Introduction: "Please understand that I
+       never wanted to write this document, being grossly underqualified,
+       but I always wanted to read it, and this was the only way. I
+       simply explain some best practices, and give reading entry-points
+       into the kernel sources. I avoid implementation details: that's
+       what the code is for, and I ignore whole tracts of useful
+       routines. This document assumes familiarity with C, and an
+       understanding of what the kernel is, and how it is used. It was
+       originally written for the 2.3 kernels, but nearly all of it
+       applies to 2.2 too; 2.0 is slightly different. ".
+       
+     * Title: "ALSA 0.5.0 Developer documentation"
+       Author: Stephan 'Jumpy' Bartels .
+       URL: http://www.math.TU-Berlin.de/~sbartels/alsa/
+       Keywords: ALSA, sound, soundcard, driver, lowlevel, hardware.
+       Description: Advanced Linux Sound Architecture for developers,
+       both at kernel and user-level sides. Work in progress. ALSA is
+       supposed to be Linux's next generation sound architecture.
+       
+     * Title: "Programming Guide for Linux USB Device Drivers"
+       Author: Detlef Fliegl.
+       URL: http://usb.in.tum.de/usbdoc/
+       Keywords: USB, universal serial bus.
+       Description: A must-read. From the Preface: "This document should
+       give detailed information about the current state of the USB
+       subsystem and its API for USB device drivers. The first section
+       will deal with the basics of USB devices. You will learn about
+       different types of devices and their properties. Going into detail
+       you will see how USB devices communicate on the bus. The second
+       section gives an overview of the Linux USB subsystem [2] and the
+       device driver framework. Then the API and its data structures will
+       be explained step by step. The last section of this document
+       contains a reference of all API calls and their return codes".
+       Notes: Beware: the main page states: "This document may not be
+       published, printed or used in excerpts without explicit permission
+       of the author". Fortunately, it may still be read...
+       
+     * Title: "Tour Of the Linux Kernel Source"
+       Author: Vijo Cherian.
+       URL: http://www.geocities.com/vijoc/tolks/tolks.html
+       Keywords: .
+       Description: A classic of this page! Was lost for a while and is
+       back again. Thanks Vijo! TOLKS: the name says it all. A tour of
+       the sources, describing directories, files, variables, data
+       structures... It covers general stuff, device drivers,
+       filesystems, IPC and Networking Code.
+       
+     * Title: "Linux Kernel Mailing List Glossary"
+       Author: John Levon.
+       URL: http://www.movement.uklinux.net/glossary.html
+       Keywords: glossary, terms, linux-kernel.
+       Description: From the introduction: "This glossary is intended as
+       a brief description of some of the acronyms and terms you may hear
+       during discussion of the Linux kernel".
+       
+     * Title: "Linux Kernel Locking HOWTO"
+       Author: Various Talented People, and Rusty.
+       URL:
+       http://netfilter.kernelnotes.org/unreliable-guides/kernel-locking-
+       HOWTO.html
+       Keywords: locks, locking, spinlock, semaphore, atomic, race
+       condition, bottom halves, tasklets, softirqs.
+       Description: The title says it all: document describing the
+       locking system in the Linux Kernel either in uniprocessor or SMP
+       systems.
+       Notes: "It was originally written for the later (>2.3.47) 2.3
+       kernels, but most of it applies to 2.2 too; 2.0 is slightly
+       different". Freely redistributable under the conditions of the GNU
+       General Public License.
+       
      BOOKS: (Not on-line)
    
      * Title: "Linux Device Drivers"
@@ -366,15 +477,33 @@
      * Title: "Linux Core Kernel Commentary. Guide to Insider's Knowledge
        on the Core Kernel od the Linux Code"
        Author: Scott Maxwell.
-       Publisher: ???.
+       Publisher: Coriolis.
        Date: 1999.
        Pages: 592.
        ISBN: 1-57610-469-9
-       Notes: CD-ROM included.
+       Notes: CD-ROM included. Line by line commentary of the kernel
+       code.
+       
+     * Title: "Linux IP Stacks Commentary"
+       Author: Stephen Satchell and HBJ Clifford.
+       Publisher: Coriolis.
+       Date: 2000.
+       Pages: ???.
+       ISBN: 1-57610-470-2
+       Notes: Line by line source code commentary book.
+       
+     * Title: "Programming for the real world - POSIX.4"
+       Author: Bill O. Gallmeister.
+       Publisher: O'Reilly & Associates, Inc..
+       Date: 1995.
+       Pages: ???.
+       ISBN: I-56592-074-0
+       Notes: Though not being directly about Linux, Linux aims to be
+       POSIX. Good reference.
        
      MISCELLANEOUS:
    
-     * Name: Linux Source Driver.
+     * Name: "Linux Source Driver"
        URL: http://lsd.linux.cz
        Keywords: Browsing source code.
        Description: "Linux Source Driver (LSD) is an application, which
@@ -385,27 +514,27 @@
        and variables) and LSD can generate patches for you on the fly
        (files, directories or kernel)".
        
-     * Name: Cross-Referencing Linux.
+     * Name: "Cross-Referencing Linux"
        URL: http://lxr.linux.no/source/
        Keywords: Browsing source code.
        Description: Another web-based Linux kernel source code browser.
        Lots of cross references to variables and functions. You can see
        where they are defined and where they are used.
        
-     * Name: Linux Weekly News.
+     * Name: "Linux Weekly News"
        URL: http://lwn.net
        Keywords: latest kernel news.
        Description: The title says it all. There's a fixed kernel section
        summarizing developers' work, bug fixes, new features and versions
        produced during the week. Published every Thursday.
        
-     * Name: Kernel Traffic.
+     * Name: "Kernel Traffic"
        URL: http://kt.linuxcare.com
        Keywords: linux-kernel mailing list, weekly kernel news.
        Description: Weekly newsletter covering the most relevant
        discussions of the linux-kernel mailing list.
        
-     * Name: CuTTiNG.eDGe.LiNuX.
+     * Name: "CuTTiNG.eDGe.LiNuX"
        URL: http://edge.kernelnotes.org
        Keywords: changelist.
        Description: Site which provides the changelist for every kernel
@@ -413,7 +542,7 @@
        the patches and describes them. Pointers to the patches are there,
        too.
        
-     * Name: New linux-kernel Mailing List FAQ.
+     * Name: "New linux-kernel Mailing List FAQ"
        URL: Original site:
        http://www.altern.org/andrebalsa/doc/lkml-faq.html
        URL: U.S. mirror site:
@@ -433,6 +562,45 @@
        Description: Set of slides, presumably from a presentation on the
        Linux VFS layer. Covers version 2.1.x, with dentries and the
        dcache.
+       
+     * Name: "Gary's Enciclopedia - The Linux Kernel"
+       Author: Gary (I suppose...).
+       URL: http://members.aa.net/~swear/pedia/kernel.html
+       Keywords: links, not found here?.
+       Description: Gary's Enciclopedia exists to allow the rapid finding
+       of documentation and other information of interest to GNU/Linux
+       users. It has about 4000 links to external pages in 150 major
+       categories. This link is for kernel-specific links, documents,
+       sites... Look there if you could not find here whar you were
+       looking for.
+       
+     * Name: "The home page of Linux-MM"
+       Author: The Linux-MM team.
+       URL: http://www.linux.eu.org/Linux-MM/
+       Keywords: memory management, Linux-MM, mm patches, TODO, docs,
+       mailing list.
+       Description: Site devoted to Linux Memory Mangement development.
+       Memory related patches, HOWTOs, links, mm developers... Don't miss
+       it if you are interested in memory management development!
+       
+     * Name: "Kernel Newbies IRC Channel"
+       URL: http://www.surriel.com/kernelnewbies.shtml
+       Keywords: IRC, newbies, channel, asking doubts.
+       Description: #kernelnewbies on irc.openprojects.net. From the web
+       page: "#kernelnewbies is an IRC network dedicated to the 'newbie'
+       kernel hacker. The audience mostly consists of people who are
+       learning about the kernel, working on kernel projects or
+       professional kernel hackers that want to help less seasoned kernel
+       people. [...] #kernelnewbies is on the Open Projects IRC Network,
+       try irc.openprojects.net or irc.<country>.openprojects.net as your
+       server and then /join #kernelnewbies".
+       
+     * Name: "linux-kernel mailing list archives and search engines"
+       URL: http://www.uwsg.indiana.edu/hypermail/linux/kernel/index.html
+       URL: http://www.kernelnotes.org/lnxlists/linux-kernel/
+       Keywords: linux-kernel, archives, search.
+       Description: Some of the linux-kernel mailing list archivers. If
+       you have a better/another one, please let me know.
      _________________________________________________________________
    
-   Document last updated on Tue Nov 30 11:20:00 CET 1999
+   Document last updated on Mon Apr 17 18:07:07 CEST 2000
diff --git a/Documentation/networking/dmfe.txt b/Documentation/networking/dmfe.txt
index 158e94ba6..c8e561596 100644
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
@@ -16,18 +16,14 @@
 
   A. Compiler command:
 
-     A-1: For normal single processor kernel
+     A-1: For normal single or multiple processor kernel
           "gcc -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall 
             -Wstrict-prototypes -O6 -c dmfe.c"
 
-     A-2: For single processor and enable kernel module version function
+     A-2: For single or multiple processor with kernel module version function
           "gcc -DMODULE -DMODVERSIONS -D__KERNEL__ -I/usr/src/linux/net/inet 
             -Wall -Wstrict-prototypes -O6 -c dmfe.c"
 
-     A-3: For multiple processors(SMP) and enable the module version function
-          "gcc -D__SMP__ -DMODULE -DMODVERSIONS -D__KERNEL__ -I/usr/src/linux
-           /net/inet -Wall -Wstrict-prototypes -O6 -c dmfe.c"
-
 
   B. The following steps teach you how to active DM9102 board:
 
diff --git a/Documentation/networking/fore200e.txt b/Documentation/networking/fore200e.txt
index 13ee5327e..b1f337f0f 100644
--- a/Documentation/networking/fore200e.txt
+++ b/Documentation/networking/fore200e.txt
@@ -1,6 +1,26 @@
 
-Fore PCA-200E/SBA-200E ATM NIC Firmware Copyright Notice
---------------------------------------------------------
+FORE Systems PCA-200E/SBA-200E ATM NIC driver
+---------------------------------------------
+
+This driver adds support for the FORE Systems 200E-series ATM adapters
+to the Linux operating system. It is based on the earlier PCA-200E driver
+written by Uwe Dannowski.
+
+The driver simultaneously supports PCA-200E and SBA-200E adapters on
+i386, alpha (untested), powerpc, sparc and sparc64 archs.
+
+The intent is to enable the use of different models of FORE adapters at the
+same time, by hosts that have several bus interfaces (such as PCI+SBUS,
+PCI+MCA or PCI+EISA).
+
+Only PCI and SBUS devices are currently supported by the driver, but support
+for other bus interfaces such as EISA should not be too hard to add (this may
+be more tricky for the MCA bus, though, as FORE made some MCA-specific
+modifications to the adapter's AALI interface).
+
+
+Firmware Copyright Notice
+-------------------------
 
 Please read the fore200e_firmware_copyright file present
 in the linux/drivers/atm directory for details and restrictions.
@@ -13,26 +33,22 @@ The FORE Systems 200E-series driver is shipped with firmware data being
 uploaded to the ATM adapters at system boot time or at module loading time. 
 The supplied firmware images should work with all adapters.
 
-However, if you encounter problems (firmware doesn't start or the driver
-is unable to read PROM data), you may consider trying another firmware
+However, if you encounter problems (the firmware doesn't start or the driver
+is unable to read the PROM data), you may consider trying another firmware
 version. Alternative binary firmware images can be found somewhere on the
-ForeThough CD-ROM supplied with your adapter by FORE Systems.
+ForeThought CD-ROM supplied with your adapter by FORE Systems.
 
 You can also get the latest firmware images from FORE Systems at
 http://www.fore.com. Register TACTics Online and go to
 the 'software updates' pages. The firmware binaries are part of
-the various ForeThough software distributions.
+the various ForeThought software distributions.
 
 Notice that different versions of the PCA-200E firmware exist, depending
 on the endianess of the host architecture. The driver is shipped with
 both little and big endian PCA firmware images.
 
 Name and location of the new firmware images can be set at kernel
-configuration time.
-
-
-Driver Rebuilding
------------------
+configuration time:
 
 1. Copy the new firmware binary files (with .bin, .bin1 or .bin2 suffix)
    to some directory, such as linux/drivers/atm.
@@ -40,11 +56,7 @@ Driver Rebuilding
 2. Reconfigure your kernel to set the new firmware name and location.
    Expected pathnames are absolute or relative to the drivers/atm directory.
 
-3. Delete the files drivers/atm/fore200e_pca_fw.[co] and/or fore200e_sba_fw.[co]
-   to ensure that the new firmware will be used when rebuilding the kernel or
-   the module.
-
-4. Rebuild and re-install your kernel or your module.
+3. Rebuild and re-install your kernel or your module.
 
 
 Feedback
@@ -52,4 +64,3 @@ Feedback
 
 Feedback is welcome. Please send success stories/bug reports/
 patches/improvement/comments/flames to <lizzi@cnam.fr>.
-
diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt
index f4b553705..be41c4031 100644
--- a/Documentation/networking/tulip.txt
+++ b/Documentation/networking/tulip.txt
@@ -142,6 +142,10 @@ tulip_core.c	- Driver core (a.k.a. where "everything else" goes)
 
 Version history
 ===============
+0.9.4.3 (April 14, 2000):
+* mod_timer fix (Hal Murray)
+* PNIC2 resusitation (Chris Smith)
+
 0.9.4.2 (March 21, 2000):
 * Fix 21041 CSR7, CSR13/14/15 handling
 * Merge some PCI ids from tulip 0.91x
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt
index 413aadf91..1eebbfef5 100644
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
@@ -1,8 +1,46 @@
 This document describes the usage and errata of the 3Com "Vortex" device
 driver for Linux.
 
+The driver was written by Donald Becker <becker@cesdis.gsfc.nasa.gov>
+
+Don is no longer the prime maintener of this version of the driver. 
+Please report problems to one or more of:
+
+  Andrew Morton <andrewm@uow.edu.au>
+  Netdev mailing list <netdev@oss.sgi.com>
+
+
 This driver supports the following hardware:
-	3c590, 3c592, 3c595, 3c597
+
+   3c590 Vortex 10Mbps
+   3c592 EISA 10mbps Demon/Vortex
+   3c597 EISA Fast Demon/Vortex
+   3c595 Vortex 100baseTx
+   3c595 Vortex 100baseT4
+   3c595 Vortex 100base-MII
+   3Com Vortex
+   3c900 Boomerang 10baseT
+   3c900 Boomerang 10Mbps Combo
+   3c900 Cyclone 10Mbps TPO
+   3c900 Cyclone 10Mbps Combo
+   3c900 Cyclone 10Mbps TPC
+   3c900B-FL Cyclone 10base-FL
+   3c905 Boomerang 100baseTx
+   3c905 Boomerang 100baseT4
+   3c905B Cyclone 100baseTx
+   3c905B Cyclone 10/100/BNC
+   3c905B-FX Cyclone 100baseFx
+   3c905C Tornado
+   3c980 Cyclone
+   3cSOHO100-TX Hurricane
+   3c555 Laptop Hurricane
+   3c575 Boomerang CardBus
+   3CCFE575 Cyclone CardBus
+   3CCFE575CT Cyclone CardBus
+   3CCFE656 Cyclone CardBus
+   3CCFEM656 Cyclone CardBus
+   3c450 Cyclone/unknown
+   3Com Boomerang (unknown version)
 
 When loaded as a module the following variables may be set:
  name	 type	description
@@ -33,3 +71,46 @@ Possible media type settings
 	16	Bus-master enable bit (experimental use only!)
 
 Details of the device driver implementation are at the top of the source file.
+
+Additional documentation is available at Don Becker's Linux Drivers site:
+
+  http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html
+
+
+Additional resources
+--------------------
+
+Donald Becker's driver development site:
+
+     http://cesdis.gsfc.nasa.gov/linux/
+
+Don's vortex-diag program is useful for inspecting the NIC's state:
+
+     http://cesdis.gsfc.nasa.gov/linux/diag/vortex-diag.c
+
+Don's mii-diag program may be used for inspecting and manipulating the
+NIC's Media Independent Interface subsystem:
+
+     http://cesdis.gsfc.nasa.gov/linux/diag/#mii-diag
+
+3Com's documentation for many NICs, including the ones supported by
+this driver is available at 
+
+     http://support.3com.com/partners/developer/developer_form.html
+
+A detailed changelog for the modifications which were made for 2.3
+series kernel is available at
+
+     http://www.uow.edu.au/~andrewm/linux/#3c59x-2.3
+
+
+
+Cisco interoperability note from Walter Wong <wcw+@CMU.EDU>:
+
+  On a side note, adding HAS_NWAY seems to share a problem with the
+  Cisco 6509 switch.  Specifically, you need to change the spanning
+  tree parameter for the port the machine is plugged into to 'portfast'
+  mode.  Otherwise, the negotiation fails.  This has been an issue
+  we've noticed for a while but haven't had the time to track down.
+
+
diff --git a/Documentation/sound/ALS b/Documentation/sound/ALS
index db98daf30..c5e55d5b7 100644
--- a/Documentation/sound/ALS
+++ b/Documentation/sound/ALS
@@ -13,9 +13,12 @@ To use an ALS sound card under Linux, enable the following options in the
 sound configuration section of the kernel config:
   - 100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support
   - FM synthesizer (YM3812/OPL-3) support 
-Since the ALS-007/100/200 is a PnP card, the sound driver probably should be
-compiled as a module, with the isapnptools used to wake up the sound card.
-Set the "I/O base for SB", "Sound Blaster IRQ" and "Sound Blaster DMA" (8 bit -
+Since the ALS-007/100/200 are PnP cards, ISAPnP support should probably be
+compiled in.
+
+Alternatively, if you decide not to use kernel level ISAPnP, you can use the
+user mode isapnptools to wake up the sound card, as in 2.2.X. Set the "I/O 
+base for SB", "Sound Blaster IRQ" and "Sound Blaster DMA" (8 bit -
 either 0, 1 or 3) to the values used in your particular installation (they
 should match the values used to configure the card using isapnp).  The
 ALS-007 does NOT implement 16 bit DMA, so the "Sound Blaster 16 bit DMA"
@@ -41,3 +44,4 @@ jwoithe@physics.adelaide.edu.au
 30 March 1998
 
 Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200
+Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info.
diff --git a/Documentation/sound/AWE32 b/Documentation/sound/AWE32
index a0f18d640..8cf3966ed 100644
--- a/Documentation/sound/AWE32
+++ b/Documentation/sound/AWE32
@@ -9,9 +9,10 @@ important, because the driver works only with real Creative cards.
 2) If your card is NOT "Plug-n-Play" then go to 5th step now. In the other case
 proceed to step 3.
 
-3) You should obtain isapnptools. I looked through other PnP packages 
-for Linux, but all they are either in deep unstable beta/alpha releases or 
-they are much worse than isapnptools. In my case isapnptools were included in 
+3) You should compile in kernel ISAPnP support or you should obtain isapnptools.
+If you choose kernel level ISAPnP skip to step 5. I looked through other PnP 
+packages for Linux, but all they are either in deep unstable beta/alpha releases
+or they are much worse than isapnptools. In my case isapnptools were included in
 a Linux distribution (Red Hat 5.x). If you also already have them then go to 
 step 4.
 
@@ -67,11 +68,7 @@ support" as <M> (module).
 
 In "make (x,menu)config" select in "Sound":
 select "OSS sound modules" as <M> (module)
-
-In "Additional low level sound drivers":
-"Additional low level sound drivers", "AWE32 synth" as <M> (module).
-Select "Additional low level sound drivers" as [y] (or [*] (yes)) (If it is not
-available as [y], select it as <M> (module))
+select "AWE32 Synth" as <M> (module)
 
 Now recompile the kernel (make dep; make (b)zImage, b(z)lilo, etc...;
 make modules; make modules_install), update your boot loader (if required) and
@@ -87,9 +84,7 @@ http://members.xoom.com/yar/synthgm.sbk.gz. Copy it to /usr and gunzip it there.
 
 alias midi awe_wave
 post-install awe_wave /usr/bin/sfxload /usr/synthfm.sbk
-options sb io=0x220 irq=5 dma=1 dma16=5 mpu_io=0x330
 
-(on io=0xaaa irq=b.... you should use your own settings)
 That will enable the Sound Blaster and AWE wave synthesis.
 
 To play midi files you should get one of these programs:
@@ -107,4 +102,4 @@ welcome.
 			    Yaroslav Rosomakho (alons55@dialup.ptt.ru)
 				    http://www.yar.opennet.ru
 
-Last Updated: 3Jan99
+Last Updated: 10Apr2000
diff --git a/Documentation/sound/README.awe b/Documentation/sound/README.awe
index b0dc82427..80054cd8f 100644
--- a/Documentation/sound/README.awe
+++ b/Documentation/sound/README.awe
@@ -23,11 +23,10 @@ not frequent now.
 
 * NOTE TO LINUX USERS
 
-To enable this driver on linux-2.[01].x kernels, you need turn on both 
-"lowlevel drivers support" and "AWE32 synth support" options in sound
-menu when configure your linux kernel and modules.  The precise
-installation procedure is described in the AWE64-Mini-HOWTO and
-linux-kernel/Documetation/sound/AWE32.
+To enable this driver on linux-2.[01].x kernels, you need turn on 
+"AWE32 synth" options in sound menu when configure your linux kernel
+and modules.  The precise installation procedure is described in the
+AWE64-Mini-HOWTO and linux-kernel/Documetation/sound/AWE32.
 
 If you're using PnP cards, the card must be initialized before loading
 the sound driver.  There're several options to do this:
diff --git a/Documentation/sound/README.modules b/Documentation/sound/README.modules
index 9cc30a3ac..39f7d954a 100644
--- a/Documentation/sound/README.modules
+++ b/Documentation/sound/README.modules
@@ -33,6 +33,12 @@ post-install sb /sbin/modprobe "-k" "adlib_card"
 options sb io=0x220 irq=7 dma=1 dma16=5 mpu_io=0x330
 options adlib_card io=0x388     # FM synthesizer
 
+ Alternatively, if you have compiled in kernel level ISAPnP support:
+
+alias char-major-14 sb
+post-install sb /sbin/modprobe "-k" "adlib_card"
+options adlib_card io=0x388
+
   The effect of this is that the sound driver and all necessary bits and
 pieces autoload on demand, assuming you use kerneld (a sound choice) and
 autoclean when not in use. Also, options for the device drivers are
diff --git a/Documentation/sound/Soundblaster b/Documentation/sound/Soundblaster
index 160763f53..515c4ec77 100644
--- a/Documentation/sound/Soundblaster
+++ b/Documentation/sound/Soundblaster
@@ -13,12 +13,19 @@ dma     	8-bit DMA channel for the Sound Blaster (0,1,3)
 dma16   	16-bit DMA channel for SB16 and equivalent cards (5,6,7)
 mpu_io		I/O for MPU chip if present (0x300,0x330)
 
-mad16=1 	Set when loading this as part of the MAD16 setup only
-trix=1  	Set when loading this as part of the Audiotrix setup only
-pas2=1		Set when loading this as part of the Pas2 setup only
 sm_games=1	Set if you have a Logitech soundman games
 acer=1		Set this to detect cards in some ACER notebooks
 mwave_bug=1	Set if you are trying to use this driver with mwave (see on)
+type		Use this to specify a specific card type
+
+The following arguments are taken if ISAPnP support is compiled in
+
+isapnp=0	Set this to disable ISAPnP detection (use io=0xXXX etc. above)
+multiple=1	Set to enable detection of multiple Soundblaster cards.
+reverse=1	Reverses the order of the search in the PnP table.
+uart401=1	Set to enable detection of mpu devices on some clones.
+isapnpjump	Jumps to a specific slot in the driver's PnP table. Use the
+		source, Luke.
 
 You may well want to load the opl3 driver for synth music on most SB and
 clone SB devices
diff --git a/Documentation/sx.txt b/Documentation/sx.txt
index f924f39bd..9d9dafc42 100644
--- a/Documentation/sx.txt
+++ b/Documentation/sx.txt
@@ -175,8 +175,13 @@ You can specify several parameters:
 		works). 
 
 	sx_irqmask: The mask of allowable IRQs to use. I suggest you set 
-                this to 0 (disable IRQs all together) and use polling if 
-		the assignment of IRQs becomes problematic.
+		this to 0 (disable IRQs all together) and use polling if 
+		the assignment of IRQs becomes problematic. This is defined
+		as the sum of (1 << irq) 's that you want to allow. So 
+		sx_irqmask of 8 (1 << 3) specifies that only irq 3 may
+		be used by the SX driver. If you want to specify to the 
+		driver: "Either irq 11 or 12 is ok for you to use", then
+		specify (1 << 11) | (1 << 12) = 0x1800 . 
 
 	sx_debug: You can enable different sorts of debug traces with this. 
 		At "-1" all debugging traces are active. You'll get several
diff --git a/Documentation/usb/dc2xx.txt b/Documentation/usb/dc2xx.txt
index 42c840ee5..af73377dc 100644
--- a/Documentation/usb/dc2xx.txt
+++ b/Documentation/usb/dc2xx.txt
@@ -1,4 +1,4 @@
-19 January 2000
+14 April 2000
 david-b@pacbell.net
 
 This is an overview of how to use the "dc2xx" USB driver with certain
@@ -17,30 +17,22 @@ to Kodak DC-240 and DC-280 cameras over USB.
 
 In addition the DC-220, DC-260, DC-265, and DC-290 are also recognized.
 However, like other cameras using the "Digita OS" (from www.flashpoint.com)
-there is no gPhoto support for this camera.  At this writing the best
-known support for these cameras is a Python script that supports image
-downloading from those cameras.  (See archives of the linux-usb mailing
-list.)  When it becomes available, the HP PhotoSmart C500 should also
-work ... it's another Digita OS camera with USB support.
+there is no gPhoto support for this camera.  There is a python script
+for accessing these cameras (see archives of the linux-usb mailing list)
+and a "Digita Services" library that can also use this driver.
 
-It's likely that other digital still cameras can also use this USB driver,
-even if they're not from Kodak and don't use Digita.  The reason is that
-most currently known USB still camera protocols treat USB like a faster
-packet-carrying connection than a serial line, which is exactly how this
-driver looks to an application.
+The HP PhotoSmart C500 should also work, since it's another Digita camera
+with USB support.
 
 
 USB HARDWARE
 
-This has been shown to work on x86 OHCI and UHCI (Intel) chipsets.  OHCI has
-been trouble free; not so with UHCI, which was first seen to be happy with
-2.3.24 kernels, and has not been as fast as OHCI.  Users on the PowerMac
-platform have had success, although the stock kernel doesn't yet support
-that platform.
+Recent kernels have had no particular problems using this driver with
+either OHCI or UHCI chipsets, and have worked on the PowerMac platform.
 
 Note that in some cases changes in BIOS settings may be needed before
 your USB works.  At least one user has reported a need for SMP-related 
-settings as well.
+settings as well, and some old hardware may not handle USB correctly.
 
 
 SETUP
@@ -50,15 +42,18 @@ as a module, or compiled in directly.
 
 Create at least one device, perhaps like this (both read and write):
 
-    # mknod -m 0666 /dev/kodak00 c 180 80
-    # mknod -m 0666 /dev/kodak01 c 180 81
+    # mknod -m 0660 /dev/usb/dc2xx0 c 180 80
+    # mknod -m 0660 /dev/usb/dc2xx1 c 180 81
     ...
 
+NOTE:  you would normally configure PAM so that the user logged in at
+the console is granted ownership of these devices.  console.perms(5)
+explains how to do this.
+
 The driver supports multiple device nodes.  The USB framework supports
-a maximum of sixteen device nodes (up to minor device number 96), though
-by default fewer devices are available.
+a maximum of sixteen device nodes (up to minor device number 96).
 
-When you plug in one camera, it will use the first device node (kodak00
+When you plug in one camera, it will use the first device node (dc2xx0
 in the example above).  A second camera will use the second device node,
 and so on.
 
@@ -69,18 +64,22 @@ First:  if you've got /proc support, make sure that the driver has hooked
 itself up correctly.
 
     - You should see an entry in /proc/bus/usb/drivers for "dc2xx",
-      if you enabled USB /proc support.
+      if you enabled USB /proc support and correctly mounted the
+      usbdevfs on /proc/bus/usb.
 
 Second:  when you connect your camera to the computer, does it get recognized
 by the driver?  (Make sure the camera is powered on!)
 
     - if you've got /proc/bus/usb/devices, you should see an entry
       something like this.  The "ProdID" may be different if you didn't
-      plug in a DC-240, but the "Driver=dc2xx" had better be there.
+      plug in a DC-240, as may the strings presented, but "Driver=dc2xx"
+      had better be there.
 
 	T:  Lev=01 Prnt=00 Port=00 Cnt=01 Dev#=  1 Spd=12  MxCh= 0
 	D:  Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
 	P:  Vendor=040a ProdID=0120 Rev= 1.08
+	S:  Manufacturer=Eastman Kodak Company
+	S:  Product=KODAK DC240 Zoom Digital Camera
 	C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr=100mA
 	I:  If#= 0 Alt= 0 #EPs= 2 Cls=00(>ifc ) Sub=00 Prot=00 Driver=dc2xx
 	E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
@@ -90,13 +89,12 @@ by the driver?  (Make sure the camera is powered on!)
 
 	Manufacturer: Eastman Kodak Company
 	Product: KODAK DC240 Zoom Digital Camera
-	Serial Number: ?
 	dc2xx.c: USB Camera #0 connected
 
 Third:  (optional) can you use gPhoto to talk to the camera?
 
-    - When you configure your camera, tell it to use "/dev/kodak00" (or
-      whatever name you used).  Right now, gPhoto emits a diagnostic
+    - When you configure your camera, tell it to use "/dev/usb/dc2xx0"
+      (or whatever name you used).  Right now, gPhoto emits a diagnostic
       message (non-GUI) saying that it since it didn't act like a TTY,
       it's assuming it's got a USB connection.
 
diff --git a/Documentation/video4linux/README.cpia b/Documentation/video4linux/README.cpia
index 2674d1fd4..7ac342ff6 100644
--- a/Documentation/video4linux/README.cpia
+++ b/Documentation/video4linux/README.cpia
@@ -51,12 +51,12 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
 
-For autoloading of all those modules you need to tell kerneld some
-stuff. Add the following line to your kerneld config-file
+For autoloading of all those modules you need to tell modutils some
+stuff. Add the following line to your modutils config-file
 (e.g. /etc/modules.conf or wherever your distribution does store that
 stuff):
 
-options parport_pc dma=3 irq=7
+options parport_pc io=0x378 irq=7 dma=3
 alias char-major-81 cpia_pp
 
 The first line tells the dma/irq channels to use. Those _must_ match