Merge with 2.1.56 as first part of merging back my code.

7 files changed, 182 insertions, 101 deletions

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 86a2391ea..c1c171f2b 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -68,6 +68,8 @@ nfsroot.txt
 	- short guide on setting up a diskless box with NFS root filesystem
 oops-tracing.txt
 	- how to decode those nasty internal kernel error dump messages.
+parport.txt
+	- how to use the parallel-port driver.
 ramdisk.txt
 	- short guide on how to set up and use the RAM disk.
 riscom8.txt
diff --git a/Documentation/Changes b/Documentation/Changes
index 8cabe2d38..b00bd197d 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -26,10 +26,7 @@ HTML-ized shopping list.
 http://www.datanet.hu/generations/linux/Changes2.html is an
 English-language HTML version.
 
-   Also, don't forget http://www.linuxhq.com/ for all your Linux kernel
-needs.
-
-Last updated: July 22. 1997
+Last updated: September 13. 1997
 Current Author: Chris Ricker (gt1355b@prism.gatech.edu).
 
 Current Minimal Requirements
@@ -39,22 +36,21 @@ Current Minimal Requirements
 encountered a bug!  If you're unsure what version you're currently
 running, the suggested command should tell you.
 
-- Kernel modules	 modutils-2.1.42         ; insmod -V
-- Gnu C 		 2.7.2.1                 ; gcc --version
+- Kernel modules	 modutils-2.1.55         ; insmod -V
+- Gnu C 		 2.7.2.3                 ; gcc --version
 - Binutils		 2.8.1.0.1               ; ld -v
-- Linux C Library	 5.4.33                  ; ls -l /lib/libc.so.*
-- Dynamic Linker (ld.so) 1.9.2                   ; ldd -v
-- Linux C++ Library	 2.7.2.1                 ; ls -l /usr/lib/libg++.so.*
-- Procps		 1.01                    ; ps --version
+- Linux C Library	 5.4.38                  ; ls -l /lib/libc.so.*
+- Dynamic Linker (ld.so) 1.9.5                   ; ldd -v
+- Linux C++ Library	 2.7.2.8                 ; ls -l /usr/lib/libg++.so.*
+- Procps		 1.2                    ; ps --version
 - Procinfo               0.11                    ; procinfo -v
-- Mount                  2.6g                    ; mount --version
+- Mount                  2.6h                    ; mount --version
 - Net-tools              1.41                    ; hostname -V
 - Loadlin                1.6a
 - Sh-utils               1.16                    ; expr --v
-- Autofs                 0.3.7                   ; automount --version
+- Autofs                 0.3.11                   ; automount --version
 - NFS                    0.4.21                  ; showmount --version
 - Bash                   1.14.7                  ; bash -version
-- Smbfs                  2.1.0
 
 Upgrade notes
 *************
@@ -80,15 +76,16 @@ accordingly.
    For modules to work, you need to be running libc-5.4.x or greater.
 Since updates to libc fix other problems as well (security flaws, for
 example) and since 5.4.7 is missing a few needed symbols, try to get
-the latest 5.4.x you can.  Currently, libc-5.4.33 is the latest public
+the latest 5.4.x you can.  Currently, libc-5.4.38 is the latest public
 release.
 
    If you upgrade to libc-5.4.x, you also have to upgrade your dynamic
-linker (ld.so) to at least 1.9.2, or all sorts of weirdness will
-happen.  Actually, ld.so-1.8.2 and later will work, but 1.9.2 is widely
+linker (ld.so) to at least 1.9.5, or all sorts of weirdness will
+happen.  Actually, ld.so-1.8.2 and later will work, but 1.9.5 is widely
 available, so if you need to upgrade, use it.  If you get a release
 later than 1.8.5, avoid 1.8.10 as it introduces a few bugs that are
-fixed in later releases.
+fixed in later releases.  Please make sure you don't install ld.so-2.x
+unless you're running glibc2 / libc6.
 
    If you upgrade to libc-5.4.x, you may also need to upgrade ypbind if
 you're using NIS.
@@ -96,7 +93,7 @@ you're using NIS.
 Modules
 =======
 
-   You need to upgrade to modutils-2.1.42 for kernels 2.1.42 and later.
+   You need to upgrade to modutils-2.1.55 for kernels 2.1.55 and later.
 This version will also work with 2.0.x kernels.
 
 Binutils
@@ -110,7 +107,7 @@ Gnu C
 =====
 
    You need at least GCC 2.7.2 to compile the kernel.  If you're
-upgrading from an earlier release, you might as well get GCC 2.7.2.1,
+upgrading from an earlier release, you might as well get GCC 2.7.2.3,
 the latest public release.  If you already have GCC 2.7.2 on your
 system, you don't have to upgrade just so the kernel will work (though
 feel free to upgrade if you want the gcc bug fixes).
@@ -146,24 +143,17 @@ Memory
 ======
 
    As of 2.1.41, the format of /proc/meminfo has changed.  This broke
-many memory utils, which have to be upgraded.  Get the new procinfo and
-procps (which, AFAIK, is not yet available) to fix this.  Until you
-upgrade, programs which read /proc/meminfo will seg-fault or give an
-error.  There is an unofficial update to 1.12.2 available that fixes
-most problems.
+many memory utils, which have to be upgraded.  Get the new procps-1.2
+and you should be set.
 
 Mount and network file systems
 ==============================
 
    The NFS code in the kernel is currently being revised, resulting in
 much-improved performance.  As a result, you'll need to upgrade mount
-to a 2.6 release.  Also, amd is being phased out in favor of the much
-better autofs.  You'll also have to get the appropriate utils to use
-autofs as well as the new NFS utils.
-
-The smbfs code is also being revised. This results in an incompatible
-mount interface. See the README of smbfs-2.1.0 or later for a
-description of the new mount command.
+to a recent 2.6 release.  Also, amd is being phased out in favor of the
+much better autofs.  You'll also have to get the appropriate utils to
+use autofs as well as the new NFS utils.
 
 RPM
 ===
@@ -223,55 +213,53 @@ ftp://sunsite.unc.edu/pub/Linux/GCC/release.binutils-2.8.1.0.1
 Gnu C
 =====
 
-The 2.7.2.1 release:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/gcc-2.7.2.1.bin.tar.gz
-ftp://sunsite.unc.edu/pub/Linux/GCC/gcc-2.7.2.1.bin.tar.gz
+The 2.7.2.3 release:
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/gcc-2.7.2.3.bin.tar.gz
+ftp://sunsite.unc.edu/pub/Linux/GCC/gcc-2.7.2.3.bin.tar.gz
 Installation notes:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/release.gcc-2.7.2.1
-ftp://sunsite.unc.edu/pub/Linux/GCC/release.gcc-2.7.2.1
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/release.gcc-2.7.2.3
+ftp://sunsite.unc.edu/pub/Linux/GCC/release.gcc-2.7.2.3
 
 Linux C Library
 ===============
 
-The 5.4.33 release:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/libc-5.4.33.bin.tar.gz
-ftp://sunsite.unc.edu/pub/Linux/GCC/libc-5.4.33.bin.tar.gz
-Installation notes for 5.4.33:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/release.libc-5.4.33
-ftp://sunsite.unc.edu/pub/Linux/GCC/release.libc-5.4.33
+The 5.4.38 release:
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/libc-5.4.38.bin.tar.gz
+ftp://sunsite.unc.edu/pub/Linux/GCC/libc-5.4.38.bin.tar.gz
+Installation notes for 5.4.38:
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/release.libc-5.4.38
+ftp://sunsite.unc.edu/pub/Linux/GCC/release.libc-5.4.38
 
 Linux C++ Library
 =================
 
-The 2.7.2.1 release:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/libg++-2.7.2.1.bin.tar.gz
-ftp://sunsite.unc.edu/pub/Linux/GCC/libg++-2.7.2.1.bin.tar.gz
+The 2.7.2.8 release:
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/libg++-2.7.2.8.bin.tar.gz
+ftp://sunsite.unc.edu/pub/Linux/GCC/libg++-2.7.2.8.bin.tar.gz
 Installation notes:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/release.libg++-2.7.2.1
-ftp://sunsite.unc.edu/pub/Linux/GCC/release.libg++-2.7.2.1
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/release.libg++-2.7.2.8
+ftp://sunsite.unc.edu/pub/Linux/GCC/release.libg++-2.7.2.8
 
 Dynamic Linker
 ==============
 
-The 1.9.2 release:
-ftp://tsx-11.mit.edu/pub/linux/packages/GCC/ld.so-1.9.2.tar.gz
-ftp://sunsite.unc.edu/pub/Linux/GCC/ld.so-1.9.2.tar.gz
+The 1.9.5 release:
+ftp://tsx-11.mit.edu/pub/linux/packages/GCC/ld.so-1.9.5.tar.gz
+ftp://sunsite.unc.edu/pub/Linux/GCC/ld.so-1.9.5.tar.gz
 
 Modules utilities
 =================
 
-The 2.1.42 release:
-ftp://ftp.redhat.com/pub/alphabits/modutils-2.1.42.tar.gz
-ftp://ftp.kernel.org/pub/linux/kernel/v2.1/modutils-2.1.42.tar.gz
+The 2.1.55 release:
+ftp://ftp.redhat.com/pub/alphabits/modutils/modutils-2.1.55.tar.gz
+ftp://ftp.kernel.org/pub/linux/kernel/v2.1/modutils-2.1.55.tar.gz
 
 Procps utilities
 ================
 
-The 1.01 release:
-ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/procps-1.01.tar.gz
-ftp://sunsite.unc.edu/pub/Linux/system/status/ps/procps-1.01.tgz
-The unofficial 1.12.2 release:
-ftp://ftp.debian.org/pub/debian/hamm/hamm/source/base/procps_1.12.2.tar.gz
+The 1.2 release:
+ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/procps-1.2.tar.gz
+ftp://sunsite.unc.edu/pub/Linux/system/status/ps/procps-1.2.tgz
 
 Procinfo utilities
 ==================
@@ -316,14 +304,14 @@ ftp://prep.ai.mit.edu/pub/gnu/sh-utils-1.16.tar.gz
 Mount
 =====
 
-The 2.6g release:
-ftp://ftp.win.tue.nl/pub/linux/util/mount-2.6g.tar.gz
+The 2.6h release:
+ftp://ftp.win.tue.nl/pub/linux/util/mount-2.6h.tar.gz
 
 Autofs
 ======
 
-The 0.3.7 release:
-ftp://ftp.kernel.org/pub/linux/daemons/autofs/autofs-0.3.7.tar.gz
+The 0.3.11 release:
+ftp://ftp.kernel.org/pub/linux/daemons/autofs/autofs-0.3.11.tar.gz
 
 NFS
 ===
@@ -335,7 +323,7 @@ ftp://linux.nrao.edu/pub/people/okir/linux-nfs-0.4.21.tar.gz
 Net-tools
 =========
 
-The 0.41 release:
+The 1.41 release:
 ftp://ftp.london.uk.eu.org/pub/ipv6/net-tools-1.41.tar.gz
 ftp://ftp.cs-ipv6.lancs.ac.uk/pub/Code/Linux/Net_Tools/net-tools-1.41.tar.gz
 
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 458f9b0ed..78525c4e0 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -1434,13 +1434,9 @@ CONFIG_ATALK
   machine on the Internet that has a program like lynx or
   netscape). EtherTalk is the name used for appletalk over ethernet
   and the cheaper and slower LocalTalk is appletalk over a proprietary
-  apple network using serial links. Ethertalk is fully supported by
-  Linux, however the localtalk drivers are not yet ready to ship. The
-  kernel however supports localtalk and when such drivers become
-  available all you will need to do is download and install the
-  localtalk driver in order to join a Localtalk network. The
-  NET-2-HOWTO, available via ftp (user: anonymous) in
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO contains valuable information
+  apple network using serial links. Ethertalk and Localtalk is fully 
+  supported by Linux. The NET-2-HOWTO, available via ftp (user: anonymous)
+  in sunsite.unc.edu:/pub/Linux/docs/HOWTO contains valuable information
   as well. 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 appletalk.o. If you want to compile
@@ -1461,8 +1457,6 @@ CONFIG_LTPC
   If you are in doubt, this card is the one with the 65C02 chip on it.
   You also need version 1.3.3 or later of the netatalk package.
   This driver is experimental, which means that it may not work.
-  In particular the module support is not yet working for the 2.1.xx
-  kernels, so choose Y or N, but not M for now.
   See README.ltpc in the drivers/net directory, and the web site
   http://www.math.unm.edu/~bradford/ltpc.html
 
@@ -1471,10 +1465,8 @@ CONFIG_COPS
   This allows you to use COPS AppleTalk cards to connect to LocalTalk
   networks. You also need version 1.3.3 or later of the netatalk
   package.  This driver is experimental, which means that it may not
-  work.  In particular the module support is not yet working for the
-  2.1.xx kernels, so choose Y or N, but not M for now.  This driver
-  will only work if you choose "Appletalk DDP" networking support,
-  above.
+  work.  This driver will only work if you choose "Appletalk DDP"
+  networking support, above.
   Please read the file Documentation/networking/README.cops.  See the
   web site http://www.math.unm.edu/~bradford/ltpc.html for localtalk
   IP tools.
@@ -1483,7 +1475,7 @@ Dayna firmware support
 CONFIG_COPS_DAYNA
   Support COPS compatible cards with Dayna style firmware (Dayna
   DL2000/ Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC
-  III).
+  III, Farallon PhoneNET PC II).
 
 Tangent firmware support
 CONFIG_COPS_TANGENT
diff --git a/Documentation/devices.tex b/Documentation/devices.tex
index f9aa0294d..37bdfae0b 100644
--- a/Documentation/devices.tex
+++ b/Documentation/devices.tex
@@ -47,7 +47,7 @@ foo \kill}%
 %
 \title{{\bf Linux Allocated Devices}}
 \author{Maintained by H. Peter Anvin $<$hpa@zytor.com$>$}
-\date{Last revised: September 5, 1997}
+\date{Last revised: September 11, 1997}
 \maketitle
 %
 \noindent
@@ -57,8 +57,9 @@ is a registry of allocated major device numbers, as well as the
 recommended {\file /dev} directory nodes for these devices.
 
 The latest version of this list is included with the Linux kernel
-sources in \LaTeX\ and ASCII form.  In case of discrepancy, the
-\LaTeX\ version is authoritative.
+sources in \LaTeX\ and ASCII form.  It is also available separate from
+{\url ftp://ftp.kernel.org/pub/linux/docs/device-list/}.  In case of
+discrepancy, the \LaTeX\ version is authoritative.
 
 This document is included by reference into the Linux Filesystem
 Standard (FSSTND).  The FSSTND is available from
@@ -66,10 +67,10 @@ Standard (FSSTND).  The FSSTND is available from
 
 To have a major number allocated, or a minor number in situations
 where that applies (e.g.\ busmice), please contact me with the
-appropriate device information.  I *very* much appreciate if you send
-me a device description in the same format as the ones already in this
-file.  Also, if you have additional information regarding any of the
-devices listed below, or if I have made a mistake, I would greatly
+appropriate device information.  I {\em very\/} much appreciate if you
+send me a device description in the same format as the ones already in
+this file.  Also, if you have additional information regarding any of
+the devices listed below, or if I have made a mistake, I would greatly
 appreciate a note.
 
 NOTE: When sending me mail, {\em please\/} include the word ``device''
@@ -176,6 +177,7 @@ reply.
 \major{43}{}{char }{isdn4linux virtual modem}
 \major{  }{}{block}{Network block devices}
 \major{44}{}{char }{isdn4linux virtual modem -- alternate devices}
+\major{  }{}{block}{Flash Translation Layer (FTL) filesystems}
 \major{45}{}{char }{isdn4linux ISDN BRI driver}
 \major{46}{}{char }{Comtrol Rocketport serial card}
 \major{47}{}{char }{Comtrol Rocketport serial card -- alternate devices}
@@ -218,7 +220,8 @@ reply.
 \major{87}{}{char }{Sony Control-A1 stereo control bus}
 \major{88}{}{char }{COMX synchronous serial card}
 \major{89}{}{char }{I$^2$C bus interface}
-\major{90}{--119}{}{Unallocated}
+\major{90}{}{char }{Memory Technology Device (RAM, ROM, Flash)}
+\major{91}{--119}{}{Unallocated}
 \major{120}{--127}{}{Local/experimental use}
 \major{128}{--239}{}{Unallocated}
 \major{240}{--254}{}{Local/experimental use}
@@ -1094,8 +1097,20 @@ net, implementing block device in userland etc.
 	\minor{0}{/dev/cui0}{Callout device corresponding to {\file ttyI0}}
 	\minordots
 	\minor{63}{/dev/cui63}{Callout device corresponding to {\file ttyI63}}
+\\
+\major{  }{}{block}{Flash Translation Layer (FTL) filesystems}
+        \minor{0}{/dev/ftla}{FTL on first Memory Technology Device}
+        \minor{16}{/dev/ftlb}{FTL on second Memory Technology Device}
+        \minor{32}{/dev/ftlc}{FTL on third Memory Technology Device}
+        \minordots
+        \minor{240}{/dev/ftlp}{FTL on 16th Memory Technology Device}
 \end{devicelist}
 
+\noindent
+Partitions are handled in the same way as for IDE disks (see major
+number 3) expect that the partition limit is 15 rather than 63 per
+disk (same as SCSI.)
+
 \begin{devicelist}
 \major{45}{}{char }{isdn4linux ISDN BRI driver}
 	\minor{0}{/dev/isdn0}{First virtual B channel raw data}
@@ -1482,7 +1497,16 @@ on {\url http://home.pages.de/~videotext/\/}.
 \end{devicelist}
 
 \begin{devicelist}
-\major{90}{--119}{}{Unallocated}
+\major{90}{}{char }{Memory Technology Device (RAM, ROM, Flash)}
+        \minor{0}{/dev/mtd0}{First MTD (rw)}
+        \minor{1}{/dev/mtdr0}{First MTD (ro)}
+        \minordots
+        \minor{30}{/dev/mtd15}{16th MTD (rw)}
+        \minor{31}{/dev/mtdr15}{16th MTD (ro)}
+\end{devicelist}
+
+\begin{devicelist}
+\major{91}{--119}{}{Unallocated}
 \end{devicelist}
 
 \begin{devicelist}
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index c9697e262..4c390293b 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -1,7 +1,7 @@
 		       LINUX ALLOCATED DEVICES
 	     Maintained by H. Peter Anvin <hpa@zytor.com>
 
-		   Last revised: September 5, 1997
+		   Last revised: September 11, 1997
 
 This list is the successor to Rick Miller's Linux Device List, which
 he stopped maintaining when he got busy with other things in 1993.  It
@@ -9,12 +9,13 @@ is a registry of allocated major device numbers, as well as the
 recommended /dev directory nodes for these devices.
 
 The latest version of this list is included with the Linux kernel
-sources in LaTeX and ASCII form.  In case of discrepancy, the LaTeX
-version is authoritative.
+sources in LaTeX and ASCII form.  It is also available separately from
+ftp://ftp.kernel.org/pub/linux/docs/device-list/.  In case of
+discrepancy, the LaTeX version is authoritative.
 
 This document is included by reference into the Linux Filesystem
-Standard (FSSTND).  The FSSTND is available via FTP from
-tsx-11.mit.edu in the directory /pub/linux/docs/linux-standards/fsstnd.
+Standard (FSSTND).  The FSSTND is available from
+ftp://tsx-11.mit.edu/pub/linux/docs/linux-standards/fsstnd/.
 
 To have a major number allocated, or a minor number in situations
 where that applies (e.g. busmice), please contact me with the
@@ -748,6 +749,16 @@ reply.
 		  0 = /dev/cui0		Callout device corresponding to ttyI0
 		      ...
 		 63 = /dev/cui63	Callout device corresponding to ttyI63
+    block	Flash Translatio Layer (FTL) filesystems
+		  0 = /dev/ftla		FTL on first Memory Technology Device
+		 16 = /dev/ftlb		FTL on second Memory Technology Device
+		 32 = /dev/ftlc		FTL on third Memory Technology Device
+		      ...
+		240 = /dev/ftlp		FTL on 16th Memory Technology Device 
+
+		Partitions are handled in the same way as for IDE
+		disks (see major number 3) expect that the partition
+		limit is 15 rather than 63 per disk (same as SCSI.)
 
  45 char	isdn4linux ISDN BRI driver
 		  0 = /dev/isdn0	First virtual B channel raw data
@@ -1042,7 +1053,14 @@ reply.
 		  1 = /dev/i2c1		Second I2C adapter
 		    ...
 
- 90-119		UNALLOCATED
+ 90 char	Memory Technology Device (RAM, ROM, Flash)
+		  0 = /dev/mtd0		First MTD (rw)
+		  1 = /dev/mtdr0	First MTD (ro)
+		    ...
+		 30 = /dev/mtd15	16th MTD (rw)
+		 31 = /dev/mtdr15	16th MTD (ro)
+
+ 91-119		UNALLOCATED
 
 120-127		LOCAL/EXPERIMENTAL USE
 
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 17a659e55..aa9f3ca45 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -6,12 +6,61 @@ You can pass parameters to the parport code to override its automatic
 detection of your hardware.  This is particularly useful if you want
 to use IRQs, since in general these can't be autoprobed successfully.
 
+The parport code is split into two parts: generic (which deals with
+port-sharing) and architecture-dependent (which deals with actually
+using the port).
+
+Parport as modules
+==================
+
 If you load the parport code as a module, say
 
-	# insmod parport.o io=0x378,0x278 irq=7,5
+	# insmod parport.o
+
+to load the generic parport code.  You then must load the
+architecture-dependent code with (for example):
+
+	# insmod parport_pc.o io=0x378,0x278 irq=7,5
+
+to tell the parport code that you want two PC-style ports, one at
+0x378 using IRQ 7, and one at 0x278 using IRQ 5.  Currently, PC-style
+(parport_pc) and ARC onboard (parport_arc) parallel ports are
+supported.
+
+Kerneld
+-------
+
+If you use kerneld, you will find it useful to edit /etc/conf.modules.
+Here is an example of the lines that need to be added:
+
+	alias parport_lowlevel parport_pc
+	options parport_pc io=0x378,0x278 irq=7,5
+
+Kerneld, in conjunction with parport, will automatically load
+parport_pc whenever a parallel port device driver (such as lp) is
+loaded.
+
+Parport probe [optional]
+-------------
 
-to tell the parport code that you want two ports, one at 0x378 using
-IRQ 7, and one at 0x278 using IRQ 5. 
+Once the architecture-dependent part of the parport code is loaded
+into the kernel, you insert the parport_probe module with:
+
+	# insmod parport_probe.o
+
+This will perform an IEEE1284 probe of any attached devices and log a
+message similar to:
+
+	parport0: Printer, BJC-210 (Canon)
+
+Additionally, if you use kerneld, you can add to /etc/conf.modules the
+following lines, to have the probe happen automatically:
+
+	post-install parport modprobe parport_probe
+	pre-remove parport modprobe -r parport_probe
+
+Parport, but not as modules
+===========================
 
 If you compile the parport code into the kernel, then you can use
 kernel boot parameters to get the same effect.  Add something like the
@@ -20,12 +69,15 @@ following to your LILO command line:
 	parport=0x378,7 parport=0x278,5
 
 You can have many `parport=...' statements, one for each port you want
-to add.  Adding `parport=0' or just `parport=' to the command-line
-will disable parport support entirely.
+to add.  Adding `parport=0' to the kernel command-line will disable
+parport support entirely.
+
+Device drivers
+==============
 
 Once the parport code is initialised, you can attach device drivers to
-ports.  Normally this happens automatically; if the lp driver is
-loaded it will create one lp device for each port found.  You can
+specific ports.  Normally this happens automatically; if the lp driver
+is loaded it will create one lp device for each port found.  You can
 override this, though, by using parameters either when you load the lp
 driver:
 
@@ -57,3 +109,8 @@ Also:
  * If your BIOS allows you to engage "ECP mode", you may find that
    your port's IRQ can be autoprobed, without having to specify any 
    parameters.
+
+
+--
+Philip.Blundell@pobox.com
+tim@cyberelk.demon.co.uk
diff --git a/Documentation/stallion.txt b/Documentation/stallion.txt
index e838de545..73d31f7bd 100644
--- a/Documentation/stallion.txt
+++ b/Documentation/stallion.txt
@@ -4,8 +4,8 @@ Stallion Multiport Serial Driver Readme
 
 Copyright (C) 1994-1997,  Stallion Technologies (support@stallion.oz.au).
 
-Version:   5.3.2
-Date:      11FEB97
+Version:   5.3.4
+Date:      15SEP97