Merge with Linux 2.3.99-pre3.

11 files changed, 446 insertions, 2363 deletions

diff --git a/Documentation/Changes b/Documentation/Changes
index 0a06bebdf..73511d74a 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -73,8 +73,11 @@ General Information
 ===================
 
    To use System V shared memory, you have to mount the shm filesystem
-somewhere and put the mountpoint into /proc/sys/kernel/shmpath.
-Default is /var/shm.
+somewhere. You can do that automatically by adding this line to /etc/fstab:
+
+none		/var/shm	shm		defaults	0 0
+
+Remember to create the mountpoint directory; it does not have to be /var/shm.
 
    <CTRL><ALT><DEL> now performs a cold reboot instead of a warm reboot
 for increased hardware compatibility.  If you want a warm reboot and
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 6d2a38183..08acaf9f3 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -186,10 +186,22 @@ 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).
+  here (default choice).  This will result in the old "3GB/1GB"
+  virtual/physical memory split. 3BG are mapped so as each processus
+  sees a 3GB virtual memory space.
+  The remaining part of the 4G 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.
-  High memory is all the physical RAM that could not be directly
+  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.
 
@@ -202,6 +214,13 @@ CONFIG_NOHIGHMEM
   processors (PPro and better). NOTE: The "64GB" kernel will not
   boot CPUs that not support PAE!
 
+  The actual amount of total physical memory will either be
+  autodetected 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 .)
+
 Normal PC floppy disk support
 CONFIG_BLK_DEV_FD
   If you want to use the floppy disk drive(s) of your PC under Linux,
@@ -372,7 +391,7 @@ CONFIG_BLK_DEV_IDE
   Useful information about large (>540 MB) IDE disks, multiple
   interfaces, what to do if ATA/IDE devices are not automatically
   detected, sound card ATA/IDE ports, module support, and other topics, is
-  contained in Documentation/ata-ide.txt. For detailed information about
+  contained in Documentation/ide.txt. For detailed information about
   hard drives, consult the Disk-HOWTO and the Multi-Disk-HOWTO,
   available from http://www.linuxdoc.org/docs.html#howto .
 
@@ -494,7 +513,7 @@ CONFIG_BLK_DEV_IDETAPE
   along with other IDE devices, as "hdb" or "hdc", or something
   similar, and will be mapped to a character device such as "ht0"
   (check the boot messages with dmesg). Be sure to consult the
-  drivers/block/ide-tape.c and Documentation/ide.txt files for usage
+  drivers/ide/ide-tape.c and Documentation/ide.txt files for usage
   information.
 
   If you want to compile the driver as a module ( = code which can be
@@ -627,7 +646,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI
   the latest version of the hdparm utility from
   ftp://metalab.unc.edu/pub/Linux/system/hardware/ .
 
-  Read the comments at the beginning of drivers/block/ide-dma.c and the
+  Read the comments at the beginning of drivers/ide/ide-dma.c and the
   file Documentation/ide.txt for more information. 
 
   It is safe to say Y to this question.
@@ -707,12 +726,12 @@ CONFIG_BLK_DEV_AEC6210
   should say Y here, and preferably also to "Use DMA by default when
   available".
 
-  Please read the comments at the top of drivers/block/aec6210.c
+  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 well.
 
 AEC6210 Tuning support (WIP)
 CONFIG_AEC6210_TUNING
-  Please read the comments at the top of drivers/block/aec6210.c  
+  Please read the comments at the top of drivers/ide/aec6210.c  
   If unsure, say N.
 
 ALI M15x3 chipset support
@@ -721,16 +740,28 @@ CONFIG_BLK_DEV_ALI15X3
   1535, 1535D onboard chipsets.  It also tests for Simplex mode and
   enables normal dual channel support.
 
-  Please read the comments at the top of drivers/block/alim15x3.c
+  Please read the comments at the top of drivers/ide/alim15x3.c
   If you say Y here, then say Y to "Use DMA by default when available" as well.
 
   If unsure, say N.
 
+ALI M15x3 WDC support (DANGEROUS)
+CONFIG_WDC_ALI15X3
+  This allows for UltraDMA support for WDC drives that ignore CRC checking.
+  You are a fool for enabling this option, but there have been requests.
+  DO NOT COMPLAIN IF YOUR DRIVE HAS FS CORUPTION, IF YOU ENABLE THIS!
+  No one will listen, just laugh for ignoring this SERIOUS WARNING.
+
+  Using this option can allow WDC drives to run at ATA-4/5 transfer rates with
+  only an ATA-2 support structure.
+
+  SAY NO!
+
 AMD7409 chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_AMD7409
   This driver ensures (U)DMA support for AMD756 Viper chipset.
 
-  Please read the comments at the top of drivers/block/amd7409.c
+  Please read the comments at the top of drivers/ide/amd7409.c
   If you say Y here, then say Y to "Use DMA by default when available" as well.
   If unsure, say N.
 
@@ -776,7 +807,7 @@ CONFIG_BLK_DEV_HPT34X
 HPT34X AUTODMA support (WIP)
 CONFIG_HPT34X_AUTODMA
   This is a dangerous thing to attempt currently!
-  Please read the comments at the top of drivers/block/hpt34x.c
+  Please read the comments at the top of drivers/ide/hpt34x.c
   If you say Y here, then say Y to "Use DMA by default when available" as well.
 
   If unsure, say N.
@@ -795,7 +826,7 @@ CONFIG_BLK_DEV_HPT366
   the ide-probe at boot. It is reported to support DVD II drives, by the
   manufacturer.
 
-  Please read the comments at the top of drivers/block/hpt366.c
+  Please read the comments at the top of drivers/ide/hpt366.c
   If you say Y here, then say Y to "Use DMA by default when available" as well.
 
 HPT366 Fast Interrupts (WIP)
@@ -813,12 +844,12 @@ CONFIG_BLK_DEV_NS87415
   This driver adds detection and support for the NS87415 chip
   (used in SPARC64, among others).
 
-  Please read the comments at the top of drivers/block/ns87415.c.
+  Please read the comments at the top of drivers/ide/ns87415.c.
 
 OPTi 82C621 enhanced support (EXPERIMENTAL)
 CONFIG_BLK_DEV_OPTI621
   This is a driver for the OPTi 82C621 EIDE controller.
-  Please read the comments at the top of drivers/block/opti621.c.
+  Please read the comments at the top of drivers/ide/opti621.c.
 
 Intel PIIXn chipsets support
 CONFIG_BLK_DEV_PIIX
@@ -827,7 +858,7 @@ CONFIG_BLK_DEV_PIIX
   PIO 0-4 mode settings, this allows dynamic tuning of the chipset
   via the standard end-user tool 'hdparm'.
 
-  Please read the comments at the top of drivers/block/piix.c
+  Please read the comments at the top of drivers/ide/piix.c
 
   Should also include "PIIXn Tuning support" CONFIG_PIIX_TUNING
   If unsure, say Y.
@@ -866,7 +897,7 @@ CONFIG_BLK_DEV_PDC202XX
   1.11 or newer required.
 
   If you say Y here, then say Y to "Use DMA by default when available" as well.
-  Please read the comments at the top of drivers/block/pdc202xx.c
+  Please read the comments at the top of drivers/ide/pdc202xx.c
 
   If unsure, say N.
 
@@ -876,7 +907,7 @@ CONFIG_PDC202XX_BURST
   for PDC20246/Ultra33 that has BIOS setup failures when using 3 or
   more cards.
 
-  Please read the comments at the top of drivers/block/pdc202xx.c
+  Please read the comments at the top of drivers/ide/pdc202xx.c
 
   If unsure, say N.
 
@@ -898,7 +929,7 @@ CONFIG_BLK_DEV_TRM290
   This driver adds support for bus master DMA transfers
   using the Tekram TRM290 PCI IDE chip. Volunteers are
   needed for further tweaking and development.
-  Please read the comments at the top of drivers/block/trm290.c.
+  Please read the comments at the top of drivers/ide/trm290.c.
 
 VIA82CXXX chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_VIA82CXXX
@@ -909,7 +940,7 @@ CONFIG_BLK_DEV_VIA82CXXX
    If no command line is provided, it will try to set fifo configuration
    at its best. It will allow you to get a proc/ide/via display
   (while running a "cat") provided you enabled "proc" support.
-  Please read the comments at the top of drivers/block/via82cxxx.c
+  Please read the comments at the top of drivers/ide/via82cxxx.c
 
   If you say Y here, then say Y to "Use DMA by default when available" as well.
 
@@ -943,14 +974,14 @@ CONFIG_BLK_DEV_ALI14XX
   boot parameter. It enables support for the secondary IDE interface
   of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster
   I/O speeds to be set as well. See the files Documentation/ide.txt
-  and drivers/block/ali14xx.c for more info.
+  and drivers/ide/ali14xx.c for more info.
 
 DTC-2278 support
 CONFIG_BLK_DEV_DTC2278
   This driver is enabled at runtime using the "ide0=dtc2278" kernel
   boot parameter. It enables support for the secondary IDE interface
   of the DTC-2278 card, and permits faster I/O speeds to be set as
-  well. See the Documentation/ide.txt and drivers/block/dtc2278.c
+  well. See the Documentation/ide.txt and drivers/ide/dtc2278.c
   files for more info.
 
 Holtek HT6560B support
@@ -958,7 +989,7 @@ CONFIG_BLK_DEV_HT6560B
   This driver is enabled at runtime using the "ide0=ht6560b" kernel
   boot parameter. It enables support for the secondary IDE interface
   of the Holtek card, and permits faster I/O speeds to be set as well.
-  See the Documentation/ide.txt and drivers/block/ht6560b.c files for
+  See the Documentation/ide.txt and drivers/ide/ht6560b.c files for
   more info.
 
 PROMISE DC4030 support (EXPERIMENTAL)
@@ -969,13 +1000,13 @@ CONFIG_BLK_DEV_PDC4030
   attached to the secondary interface. CDROM and TAPE devices are not
   supported yet. This driver is enabled at runtime using the
   "ide0=dc4030" kernel boot parameter. See the Documentation/ide.txt
-  and drivers/block/pdc4030.c files for more info.
+  and drivers/ide/pdc4030.c files for more info.
 
 QDI QD6580 support
 CONFIG_BLK_DEV_QD6580
   This driver is enabled at runtime using the "ide0=qd6580" kernel
   boot parameter. It permits faster I/O speeds to be set. See the
-  files Documentation/ide.txt and drivers/block/qd6580.c for more
+  files Documentation/ide.txt and drivers/ide/qd6580.c for more
   info.
 
 UMC 8672 support
@@ -983,7 +1014,7 @@ CONFIG_BLK_DEV_UMC8672
   This driver is enabled at runtime using the "ide0=umc8672" kernel
   boot parameter. It enables support for the secondary IDE interface
   of the UMC-8672, and permits faster I/O speeds to be set as well.
-  See the files Documentation/ide.txt and drivers/block/umc8672.c for
+  See the files Documentation/ide.txt and drivers/ide/umc8672.c for
   more info.
 
 Amiga builtin Gayle IDE interface support
@@ -2135,6 +2166,14 @@ CONFIG_HUB6
   Say Y here to enable support in the dumb serial driver to support
   the HUB6 card.
 
+Support for hot-pluggable devices
+CONFIG_HOTPLUG
+  Say Y here to enable support for hot plugin of certain hardware such as
+  PCMCIA cards and the like.
+
+  At this moment, few drivers support it, but as they get converted to use the
+  new ressource allocator/manager, their number will increase.
+
 PCMCIA serial device support
 CONFIG_PCMCIA_SERIAL_CS
   Say Y here to enable support for 16-bit PCMCIA serial devices,
@@ -2728,6 +2767,27 @@ S3 Trio frame buffer device support
 CONFIG_FB_S3TRIO
   If you have a S3 Trio say Y. Say N for S3 Virge. 
 
+3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)
+CONFIG_FB_3DFX
+  This driver supports graphics boards with the 3Dfx Banshee/Voodoo3 chips.
+  Say Y if you have such a graphics board.
+
+  The driver is also available as a module ( = code which can be
+  inserted and removed from the running kernel whenever you want). The
+  module will be called tdfxfb.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+nVidia Riva support (EXPERIMENTAL)
+CONFIG_FB_RIVA
+  This driver supports graphics boards with the nVidia Riva (aka TNTx)
+  chips.
+  Say Y if you have such a graphics board.
+
+  The driver is also available as a module ( = code which can be
+  inserted and removed from the running kernel whenever you want). The
+  module will be called rivafb.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 ATI Mach64 display support (EXPERIMENTAL)
 CONFIG_FB_ATY
   This driver supports graphics boards with the ATI Mach64 chips.
@@ -2808,19 +2868,36 @@ CONFIG_FB_VGA16
   running kernel whenever you want), say M here and read
   Documentation/modules.txt. The module will be called vga16fb.o.
 
+Select other compiled-in fonts
+CONFIG_FBCON_FONTS
+  Say Y here if you would like to use fonts other than the default your frame
+  buffer console usually use.
+
+  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
+  about foreign fonts.
+
+  If unsure, say N (the default choices are safe).
+
 VGA 8x16 font
 CONFIG_FONT_8x16
   This is the "high resolution" font for the VGA frame buffer (the one
-  provided by the text console 80x25 mode.
+  provided by the VGA text console 80x25 mode.
+
+  If unsure, say Y.
 
 Support only 8 pixels wide fonts
 CONFIG_FBCON_FONTWIDTH8_ONLY
   Answer Y here will make the kernel provide only the 8x8 fonts (these
   are the less readable).
 
+  If unsure, say N.
+
 Sparc console 8x16 font
 CONFIG_FONT_SUN8x16
-  This is the high resolution console font for Sun machines. Say Y.
+  This is the high resolution console font for Sun machines.
+
+  Say Y.
 
 Sparc console 12x22 font (not supported by all drivers)
 CONFIG_FONT_SUN12x22
@@ -2834,6 +2911,7 @@ CONFIG_FONT_8x8
   provided by the text console 80x50 (and higher) modes.
   Note this is a poor quality font. The VGA 8x16 font is quite a lot
   more readable.
+
   Given the resolution provided by the frame buffer device, answer N
   here is safe.
 
@@ -2844,13 +2922,25 @@ CONFIG_FB_COMPAT_XPMAC
   includes a server that supports the frame buffer device directly
   (XF68_FBDev).
 
+HGA monochrome support (EXPERIMENTAL)
+Hercules mono graphics console (EXPERIMENTAL)
+CONFIG_FBCON_HGA
+  Say Y here if you have a Hercules mono graphics card.
+
+  This driver is also available as a module ( = code which can be
+  inserted and removed from the running kernel whenever you want).
+  The module will be called hgafb.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+
+  As this card technology is 15 years old, most people will answer N here.
+
 Matrox unified accelerated driver (EXPERIMENTAL)
 CONFIG_FB_MATROX
   Say Y here if you have Matrox Millennium, Matrox Millennium II,
   Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
-  Mystique G200, Matrox Millennium G200 or Matrox Marvel G200 video
-  card in your box. At this time, support for the G100, Mystique G200
-  and Marvel G200 is untested.
+  Mystique G200, Matrox Millennium G200, Matrox Marvel G200 video or
+  Matrox G400 card in your box. At this time, support for the G100,
+  Mystique G200 and Marvel G200 is untested.
 
   This driver is also available as a module ( = code which can be
   inserted and removed from the running kernel whenever you want).
@@ -3784,6 +3874,12 @@ CONFIG_DECNET_ROUTER
 
    See Documentation/networking/decnet.txt for more information.
 
+Appletalk interfaces support
+CONFIG_APPLETALK
+  AppleTalk is the way Apple computers speak to each other on a
+  network. If your Linux box is connected to such a network and you
+  want to join the conversation, say Y.
+
 AppleTalk DDP
 CONFIG_ATALK
   AppleTalk is the way Apple computers speak to each other on a
@@ -6069,7 +6165,7 @@ CONFIG_BONDING
   with a similar Bonding Linux driver, a Cisco 5500 switch or a
   SunTrunking SunSoft driver.
 
-  This is similar to the EQL driver, but it merge etherner segments instead
+  This is similar to the EQL driver, but it merge ethernet segments instead
   of serial lines.
 
   If you want to compile this as a module ( = code which can be
@@ -6718,6 +6814,17 @@ CONFIG_ECONET_NATIVE
   Say Y here if you have a native Econet network card installed in
   your computer.
 
+Wan interfaces support
+CONFIG_WAN
+  Wide Area Networks (WANs), such as X.25, frame relay and leased
+  lines, are used to interconnect Local Area Networks (LANs) over vast
+  distances with data transfer rates significantly higher than those
+  achievable with commonly used asynchronous modem connections.
+
+  Say Y here if you want to use such interconnections.
+
+  It is safe to say N. Most people won't need it.
+
 WAN Router
 CONFIG_WAN_ROUTER
   Wide Area Networks (WANs), such as X.25, frame relay and leased
@@ -6743,6 +6850,18 @@ CONFIG_WAN_ROUTER
 
   If unsure, say N.
 
+WAN router drivers
+CONFIG_WAN_ROUTER_DRIVERS
+  Wide Area Networks (WANs), such as X.25, frame relay and leased
+  lines, are used to interconnect Local Area Networks (LANs) over vast
+  distances with data transfer rates significantly higher than those
+  achievable with commonly used asynchronous modem connections.
+  Usually, a quite expensive external device called a `WAN router' is
+  needed to connect to a WAN.
+
+  Say Y here will enable the kernel to a??? as a WAN router betwenn LAN by
+  means of WAN adapters.
+
 Fast switching (read help!)
 CONFIG_NET_FASTROUTE
   Saying Y here enables direct NIC-to-NIC (NIC = Network Interface
@@ -7037,8 +7156,14 @@ CONFIG_COSA
   The module will be called cosa.o. For general information about
   modules read Documentation/modules.txt.
 
-# Fibre Channel driver support
-# CONFIG_NET_FC
+Fibre Channel driver support
+CONFIG_NET_FC
+  Say Y here provide support for storage arrays connected to
+  the system using Fibre Optic and the "X3.269-199X Fibre Channel
+  Protocol for SCSI" specification. You'll also need the generic SCSI
+  support, as well as the drivers for the storage array itself and
+  for the interface adapter such as SOC or SOC+. This subsystem could even
+  serve for IP networking, with some code extensions. If unsure, say N.
 
 # Interphase 5526 Tachyon chipset based adaptor support
 # CONFIG_IPHASE5526
@@ -9154,6 +9279,21 @@ 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 10 171 and
+  configure it in your software.
+
+  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 mdc800.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+
 USB Mass Storage support
 CONFIG_USB_STORAGE
   Say Y here if you want to connect USB mass storage devices to your
@@ -9473,6 +9613,23 @@ CONFIG_VFAT_FS
   say M here and read Documentation/modules.txt. The module will be
   called vfat.o.
 
+Compressed ROM file system support
+CONFIG_CRAMFS
+  This option provides support for CramFs (Compressed ROM File System).
+  Cramfs is designed to be a simple, small, and compressed file system for ROM
+  based embedded systems.
+  CramFs is read-only, limited to 256MB file systems (with 16MB files), don't
+  support neither 16/32 bits uid/gid nor hard links. Neither are timestamps.
+  It isn't endian aware.
+  
+  See Documentation/filesystems/cramfs.txt and fs/cramfs/README
+  for further 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),
+  say M here and read Documentation/modules.txt. The module will be
+  called cramfs.o.
+
 UMSDOS: Unix-like file system on top of standard MSDOS fs
 CONFIG_UMSDOS_FS
   Say Y here if you want to run Linux from within an existing DOS
@@ -9871,7 +10028,9 @@ CONFIG_PARTITION_ADVANCED
 
   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 about foreign partitioning schemes. If unsure, say N.
+  the questions about foreign partitioning schemes.
+
+  If unsure, say N.
 
 Alpha OSF partition support
 CONFIG_OSF_PARTITION
@@ -11375,11 +11534,17 @@ CONFIG_PM
   This enable the kernel to lower the requested computer power by making some
   devices enter in lower power levels (standy, sleep, ... modes).
   Basically, this let you save power.
+
   Two majors interfaces exist between the hardware and the OS, the older
   Advanced Power Management (APM) and the newer Advanced Configuration and
   Power Interface (ACPI).
+
   Both are supported by the Linux Kernel.
 
+  Note that on some architectures (such as ia32), the idle task perform hlt
+  instructions which makes the CPU enter a low power mode. This can be seen as
+  the first kernel PM level.
+
 Enter S1 for sleep (EXPERIMENTAL)
 CONFIG_ACPI_S1_SLEEP
   This enable ACPI compliant devices to enter level 1 of ACPI saving
@@ -12882,22 +13047,12 @@ CONFIG_ISDN_TTY_FAX
   an ISDN-fax-machine. This must be supported by the lowlevel driver
   also. See Documentation/isdn/README.fax for more information.
 
-AVM CAPI2.0 support
-CONFIG_ISDN_DRV_AVMB1
-  This enables support for the AVM B1/T1 ISDN networking cards.In
-  addition, a CAPI (Common ISDN Application Programming Interface, a
+CAPI2.0 support
+CONFIG_ISDN_CAPI
+  This provides the CAPI (Common ISDN Application Programming Interface, a
   standard making it easy for programs to access ISDN hardware, see
-  http://www.capi.org/; to browse the WWW, you need to have access to
-  a machine on the Internet that has a program like lynx or netscape)
-  interface for this card is provided. In order to use this card,
-  additional firmware is necessary, which has to be downloaded into
-  the card using a utility which is distributed separately. Please
-  read the file Documentation/isdn/README.avmb1. 
-  
-  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 avmb1.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
+  http://www.capi.org/. This is needed for AVM's set of active ISDN
+  controllers like B1, T1, M1.
 
 AVM B1 ISA support
 CONFIG_ISDN_DRV_AVMB1_B1ISA
@@ -12907,6 +13062,10 @@ AVM B1 PCI support
 CONFIG_ISDN_DRV_AVMB1_B1PCI
   Enable support for the PCI version of the AVM B1 card.
 
+AVM B1 PCI V4 support
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4
+  Enable support for the V4 version of AVM B1 PCI card.
+
 AVM T1/T1-B ISA support
 CONFIG_ISDN_DRV_AVMB1_T1ISA
   Enable support for the AVM T1 T1B card.
@@ -12921,6 +13080,11 @@ CONFIG_ISDN_DRV_AVMB1_T1PCI
   Enable support for the AVM T1 T1B card.
   Note: This is a PRI card and handle 30 B-channels.
 
+AVM C4 support
+CONFIG_ISDN_DRV_AVMB1_C4
+  Enable support for the AVM C4 PCI card.
+  This card handle 4 BRI ISDN lines (8 channels).
+
 Verbose reason code reporting (kernel size +=7K)
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
   If you say Y here, the AVM B1 driver will give verbose reasons for
@@ -13144,7 +13308,7 @@ CONFIG_IEEE1394_OHCI1394
   say M here and read Documentation/modules.txt. The module will be
   called ohci1394.o.
 
-RAW IEEE 1394 I/O support
+Raw IEEE 1394 I/O support
 CONFIG_IEEE1394_RAWIO
   Say Y here if you want support for the raw device. This is generally
   a good idea, so you should say Y here. The raw device enables
@@ -13155,6 +13319,17 @@ CONFIG_IEEE1394_RAWIO
   say M here and read Documentation/modules.txt. The module will be
   called raw1394.o.
 
+Excessive debugging output
+CONFIG_IEEE1394_VERBOSEDEBUG
+  If you say Y here, you will get very verbose debugging logs from the
+  subsystem which includes a dump of the header of every sent and
+  received packet.  This can amount to a high amount of data collected
+  in a very short time which is usually also saved to disk by the
+  system logging daemons.
+
+  Say Y if you really want or need the debugging output, everyone else
+  says N.
+
 #
 # m68k-specific kernel options
 # Documented by Chris Lawrence <quango@themall.net> et al.
@@ -13193,6 +13368,14 @@ CONFIG_HP300
   If you plan to try to use the kernel on such a machine say Y here.
   Everybody else says N.
 
+Sun 3X support
+CONFIG_SUN3X
+  This option enables support for the Sun 3x series of workstations. Be
+  warned that this support is very experimental. You will also want to
+  say Y to 68020 support and N to the other processors below.
+
+  If you don't want to compile a kernel for a Sun 3x, say N.
+
 Sun 3 support
 CONFIG_SUN3
   This option enables support for the Sun 3 series of workstations. Be
@@ -13256,8 +13439,8 @@ CONFIG_M68KFPU_EMU_EXTRAPREC
   mantissa and round slightly incorrect, what is more then enough
   for normal usage.
 
-Advanced processor options
-CONFIG_ADVANCED_CPU
+Advanced configuration options
+CONFIG_ADVANCED
   This gives you access to some advanced options for the CPU. The
   defaults should be fine for most users, but these options may make
   it possible for you to improve performance somewhat if you know what
@@ -14224,45 +14407,6 @@ CONFIG_ARCH_PERSONAL_SERVER
   If you have any questions or comments about the  Compaq Personal
   Server, send e-mail to skiff@crl.dec.com
 
-Virtual/Physical Memory Split
-CONFIG_1GB
-  If you are compiling a kernel which will never run on a machine
-  with more than 1 Gigabyte total physical RAM, answer "3GB/1GB"
-  here (default choice).
-
-  On 32-bit x86 systems Linux can use up to 64 Gigabytes of physical
-  memory. However 32-bit x86 processors have only 4 Gigabytes of
-  virtual memory space. This option specifies the maximum amount of
-  virtual memory space one process can potentially use. Certain types
-  of applications (eg. database servers) perform better if they have
-  as much virtual memory per process as possible.
-
-  The remaining part of the 4G 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.
-
-  [WARNING! Certain boards do not support PCI DMA to physical addresses
-  bigger than 2 Gigabytes. Non-DMA-able memory must not be permanently
-  mapped by the kernel, thus a 1G/3G split will not work on such boxes.]
-
-  As you can see there is no 'perfect split' - the fundamental
-  problem is that 4G of 32-bit virtual memory space is short. So
-  you'll have to pick your own choice - depending on the application
-  load of your box. A 2G/2G split is typically a good choice for a
-  generic Linux server with lots of RAM.
-
-  Any potentially remaining (not permanently mapped) part of physical
-  memory is called 'high memory'. How much total high memory the kernel
-  can handle is influenced by the (next) High Memory configuration option.
-
-  The actual amount of total physical memory will either be
-  autodetected 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 .)
-
 Math emulation
 CONFIG_NWFPE
   Say Y to include the NWFPE floating point emulator in the kernel.
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 155133a0a..368f037f7 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -26,8 +26,11 @@ kernel-api.sgml: kernel-api.tmpl
 		$(TOPDIR)/arch/i386/kernel/mca.c \
 		$(TOPDIR)/arch/i386/kernel/mtrr.c \
 		$(TOPDIR)/drivers/char/misc.c \
-		$(TOPDIR)/drivers/char/serial.c \
 		$(TOPDIR)/drivers/char/videodev.c \
+		$(TOPDIR)/drivers/net/net_init.c \
+		$(TOPDIR)/drivers/net/8390.c \
+		$(TOPDIR)/drivers/char/serial.c \
+		$(TOPDIR)/drivers/pci/pci.c \
 		$(TOPDIR)/drivers/sound/sound_core.c \
 		$(TOPDIR)/drivers/sound/sound_firmware.c \
 		$(TOPDIR)/drivers/net/wan/syncppp.c \
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 96dd9ecc0..f0013b011 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -49,7 +49,7 @@
   </chapter>
 
   <chapter id="miscdev">
-     <title>Miscellaneous Device</title>
+     <title>Miscellaneous Devices</title>
 !Edrivers/char/misc.c
   </chapter>
 
@@ -58,6 +58,12 @@
 !Edrivers/char/videodev.c
   </chapter>
 
+  <chapter id="netdev">
+     <title>Network devices</title>
+!Idrivers/net/net_init.c
+!Edrivers/net/8390.c
+  </chapter>
+
   <chapter id="snddev">
      <title>Sound Devices</title>
 !Edrivers/sound/sound_core.c
@@ -89,4 +95,9 @@
 !Edrivers/net/wan/z85230.c
   </chapter>
 
+  <chapter id="pcilib">
+     <title>PCI Support Library</title>
+!Edrivers/pci/pci.c
+  </chapter>
+
 </book>
diff --git a/Documentation/devices.tex b/Documentation/devices.tex
deleted file mode 100644
index f3767f5ef..000000000
--- a/Documentation/devices.tex
+++ /dev/null
@@ -1,2209 +0,0 @@
-\documentstyle{article}
-% $Id: devices.tex,v 1.14 1998/08/10 22:39:24 hpa Exp $
-% ---------------------------------------------------------------------------
-% Adopt somewhat reasonable margins, so it doesn't take a million
-% pages to print... :-)  If you're actually putting this in print, you
-% may wish to change these.
-\oddsidemargin=0in
-\textwidth=6.5in
-\topmargin=0in
-\headheight=0.5in
-\headsep=0.25in
-\textheight=7.5in
-\footskip=0.75in
-\footheight=0.5in
-%
-\begin{document}
-\newcommand{\file}{\tt}			% Style to use for a filename
-\newcommand{\url}{\it}		        % Style to use for an URL
-\newcommand{\hex}{\tt}			% Style to use for a hex number
-\newcommand{\ud}{(Under development)}	% Abbreviation
-\newcommand{\1}{\({}^1\)}
-\newcommand{\2}{\({}^2\)}
-\newcommand{\3}{\({}^3\)}
-\newcommand{\4}{\({}^4\)}
-\newlength{\dig}
-\settowidth{\dig}{0}			% Get width of digits
-\newcommand{\num}[2]{\makebox[#1\dig][r]{#2}}
-\newcommand{\major}[4]{\num{3}{#1}#2 \> #3 \> #4 \\}
-\newcommand{\minor}[3]{\> \> \num{3}{#1} \> {\file #2} \> #3 \\}
-\newcommand{\minordots}{\> \> \> \dots \\}
-\newenvironment{devicelist}%
- {\begin{tabbing}%
-000--000 \= blockxxx \= 000 \= {\file /dev/input/keyboardxxx} \= foo \kill}%
- {\end{tabbing}}
-\newcommand{\link}[4]{{\file #1} \> {\file #2} \> #3 \> #4 \\}
-\newcommand{\vlink}[4]{{\file #1} \> {\em #2 \/} \> #3 \> #4 \\}
-\newcommand{\node}[3]{{\file #1} \> #2 \> #3 \\}
-\newcommand{\tum}{$''$}
-\newenvironment{nodelist}%
- {\begin{tabbing}%
-{\file /dev/crambamboli} \= {\file /proc/self/fd/99} \= symbolicxxx \=
-foo \kill}%
- {\end{tabbing}}
-%
-% If you reformat this document, *please* make sure this information
-% gets included!  This list changes frequently, so it is crucial to
-% know the date of the revision.
-%
-\title{{\bf Linux Allocated Devices}}
-\author{Maintained by H. Peter Anvin $<$hpa@zytor.com$>$}
-\date{Last revised: August 10, 1998}
-\maketitle
-%
-\noindent
-This list is the Linux Device List, the official registry of allocated
-device numbers and {\file /dev} directory nodes for the Linux
-operating system.
-
-The latest version of this list is included with the Linux kernel
-sources in \LaTeX\ and ASCII form.  It is also available separately
-from {\url ftp://ftp.kernel.org/pub/linux/docs/device-list/}.  In case
-of discrepancy between the text and \LaTeX\ versions, the \LaTeX\
-version is authoritative.
-
-This document is included by reference into the Linux Filesystem
-Standard (FSSTND).  The FSSTND is available from
-{\url ftp://tsx-11.mit.edu/pub/linux/docs/linux-standards/fsstnd/}.
-
-Allocations marked (68k/Amiga) apply to Linux/68k on the Amiga
-platform only.  Allocations marked (68k/Atari) apply to Linux/68k on
-the Atari platform only.
-
-This document is in the public domain.  The author requests, however,
-that semantically altered versions are not distributed without
-permission of the author, assuming the author can be contacted without
-an unreasonable effort.
-
-In particular, please don't sent patches for this list to Linus, at
-least not without contacting me first.
-
-I do not have any information about these devices beyond what appears
-on this list.  Any such information requests will be deleted without
-reply.
-
-\section{How to submit a device entry}
-
-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.  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.
-
-I do, however, make two requests about the nature of your report.
-This is necessary for me to be able to keep this list up to date and
-correct in a timely manner.  First of all, {\em please\/} include the
-word ``device'' in the subject so your mail won't accidentally get
-buried!  I receive hundreds of email messages a day, so mail sent with
-other subjects may very well get lost in the avalanche.
-
-Second, please include a description of the device {\em in the same
-format as this list\/}.  The reason for this is that it is the only
-way I have found to ensure I have all the requisite information to
-publish your device and avoid conflicts.
-
-Your cooperation is appreciated.
-
-\section{Major numbers}
-
-\begin{devicelist}
-\major{ 0}{}{     }{Unnamed devices (e.g. non-device mounts)}
-\major{ 1}{}{char }{Memory devices}
-\major{  }{}{block}{RAM disk}
-\major{ 2}{}{char }{Pseudo-TTY masters}
-\major{  }{}{block}{Floppy disks}
-\major{ 3}{}{char }{Pseudo-TTY slaves}
-\major{  }{}{block}{First MFM, RLL or IDE hard disk/CD-ROM interface}
-\major{ 4}{}{char }{TTY devices}
-\major{ 5}{}{char }{Alternate TTY devices}
-\major{ 6}{}{char }{Parallel printer devices}
-\major{ 7}{}{char }{Virtual console access devices}
-\major{  }{}{block}{Loopback devices}
-\major{ 8}{}{block}{SCSI disk devices (0-15)}
-\major{ 9}{}{char }{SCSI tape devices}
-\major{  }{}{block}{Metadisk (RAID) devices}
-\major{10}{}{char }{Non-serial mice, misc features}
-\major{11}{}{char }{Raw keyboard device}
-\major{  }{}{block}{SCSI CD-ROM devices}
-\major{12}{}{char }{QIC-02 tape}
-\major{  }{}{block}{MSCDEX CD-ROM callback support}
-\major{13}{}{char }{PC speaker}
-\major{  }{}{block}{8-bit MFM/RLL/IDE controller}
-\major{14}{}{char }{Sound card}
-\major{  }{}{block}{BIOS harddrive callback support}
-\major{15}{}{char }{Joystick}
-\major{  }{}{block}{Sony CDU-31A/CDU-33A CD-ROM}
-\major{16}{}{char }{Non-SCSI scanners}
-\major{  }{}{block}{GoldStar CD-ROM}
-\major{17}{}{char }{Chase serial card}
-\major{  }{}{block}{Optics Storage CD-ROM}
-\major{18}{}{char }{Chase serial card -- alternate devices}
-\major{  }{}{block}{Sanyo CD-ROM}
-\major{19}{}{char }{Cyclades serial card}
-\major{  }{}{block}{``Double'' compressed disk}
-\major{20}{}{char }{Cyclades serial card -- alternate devices}
-\major{  }{}{block}{Hitachi CD-ROM}
-\major{21}{}{char }{Generic SCSI access}
-\major{  }{}{block }{Acorn MFM hard drive interface}
-\major{22}{}{char }{Digiboard serial card}
-\major{  }{}{block}{Second IDE hard disk/CD-ROM interface}
-\major{23}{}{char }{Digiboard serial card -- alternate devices}
-\major{  }{}{block}{Mitsumi proprietary CD-ROM}
-\major{24}{}{char }{Stallion serial card}
-\major{  }{}{block}{Sony CDU-535 CD-ROM}
-\major{25}{}{char }{Stallion serial card -- alternate devices}
-\major{  }{}{block}{First Matsushita (Panasonic/SoundBlaster) CD-ROM}
-\major{26}{}{char }{Quanta WinVision frame grabber}
-\major{  }{}{block}{Second Matsushita (Panasonic/SoundBlaster) CD-ROM}
-\major{27}{}{char }{QIC-117 tape}
-\major{  }{}{block}{Third Matsushita (Panasonic/SoundBlaster) CD-ROM}
-\major{28}{}{char }{Stallion serial card -- card programming}
-\major{  }{}{char }{Atari SLM ACSI laser printer (68k/Atari)}
-\major{  }{}{block}{Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM}
-\major{  }{}{block}{ACSI disk/CD-ROM (68k/Atari)}
-\major{29}{}{char }{Universal frame buffer}
-\major{  }{}{block}{Aztech/Orchid/Okano/Wearnes CD-ROM}
-\major{30}{}{char }{iBCS-2 compatibility devices}
-\major{  }{}{block}{Philips LMS CM-205 CD-ROM}
-\major{31}{}{char }{MPU-401 MIDI}
-\major{  }{}{block}{ROM/flash memory card}
-\major{32}{}{char }{Specialix serial card}
-\major{  }{}{block}{Philips LMS CM-206 CD-ROM}
-\major{33}{}{char }{Specialix serial card -- alternate devices}
-\major{  }{}{block}{Third IDE hard disk/CD-ROM interface}
-\major{34}{}{char }{Z8530 HDLC driver}
-\major{  }{}{block}{Fourth IDE hard disk/CD-ROM interface}
-\major{35}{}{char }{tclmidi MIDI driver}
-\major{  }{}{block}{Slow memory ramdisk}
-\major{36}{}{char }{Netlink support}
-\major{  }{}{block}{MCA ESDI hard disk}
-\major{37}{}{char }{IDE tape}
-\major{  }{}{block}{Zorro II ramdisk}
-\major{38}{}{char }{Myricom PCI Myrinet board}
-\major{  }{}{block}{Reserved for Linux/AP+}
-\major{39}{}{char }{ML-16P experimental I/O board}
-\major{  }{}{block}{Reserved for Linux/AP+}
-\major{40}{}{char }{Matrox Meteor frame grabber}
-\major{  }{}{block}{Syquest EZ135 parallel port removable drive}
-\major{41}{}{char }{Yet Another Micro Monitor}
-\major{  }{}{block}{MicroSolutions BackPack parallel port CD-ROM}
-\major{42}{}{}{Demo/sample use}
-\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{  }{}{block}{Parallel port IDE disk devices}
-\major{46}{}{char }{Comtrol Rocketport serial card}
-\major{  }{}{block}{Parallel port ATAPI CD-ROM devices}
-\major{47}{}{char }{Comtrol Rocketport serial card -- alternate devices}
-\major{  }{}{block}{Parallel port ATAPI disk devices}
-\major{48}{}{char }{SDL RISCom serial card}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{49}{}{char }{SDL RISCom serial card -- alternate devices}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{50}{}{char}{Reserved for GLINT}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{51}{}{char }{Baycom radio modem}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{52}{}{char }{Spellcaster DataComm/BRI ISDN card}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{53}{}{char }{BDM interface for remote debugging MC683xx microcontrollers}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{54}{}{char }{Electrocardiognosis Holter serial card}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{55}{}{char }{DSP56001 digital signal processor}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\major{56}{}{char }{Apple Desktop Bus}
-\major{  }{}{block}{Fifth IDE hard disk/CD-ROM interface}
-\major{57}{}{char }{Hayes ESP serial card}
-\major{  }{}{block}{Sixth IDE hard disk/CD-ROM interface}
-\major{58}{}{char }{Hayes ESP serial card -- alternate devices}
-\major{  }{}{block}{Reserved for logical volume manager}
-\major{59}{}{char }{sf firewall package}
-\major{60}{--63}{}{Local/experimental use}
-\major{64}{}{char }{ENskip kernel encryption package}
-\major{65}{}{char }{Sundance ``plink'' Transputer boards}
-\major{  }{}{block}{SCSI disk devices (16-31)}
-\major{66}{}{char }{YARC PowerPC PCI coprocessor card}
-\major{  }{}{block}{SCSI disk devices (32-47)}
-\major{67}{}{char }{Coda network filesystem}
-\major{  }{}{block}{SCSI disk devices (48-63)}
-\major{68}{}{char }{CAPI 2.0 interface}
-\major{  }{}{block}{SCSI disk devices (64-79)}
-\major{69}{}{char }{MA16 numeric accelerator card}
-\major{  }{}{block}{SCSI disk devices (80-95)}
-\major{70}{}{char }{SpellCaster Protocol Services Interface}
-\major{  }{}{block}{SCSI disk devices (96-111)}
-\major{71}{}{char }{Computone IntelliPort II serial card}
-\major{  }{}{block}{SCSI disk devices (112-127)}
-\major{72}{}{char }{Computone IntelliPort II serial card -- alternate devices}
-\major{73}{}{char }{Computone IntelliPort II serial card -- control devices}
-\major{74}{}{char }{SCI bridge}
-\major{75}{}{char }{Specialix IO8+ serial card}
-\major{76}{}{char }{Specialix IO8+ serial card -- alternate devices}
-\major{77}{}{char }{ComScire Quantum Noise Generator}
-\major{78}{}{char }{PAM Software's multimodem boards}
-\major{79}{}{char }{PAM Software's multimodem boards -- alternate devices}
-\major{80}{}{char }{Photometrics AT200 CCD camera}
-\major{81}{}{char }{video4linux}
-\major{82}{}{char }{WiNRADiO communications receiver card}
-\major{83}{}{char }{Teletext/videotext interfaces}
-\major{84}{}{char }{Ikon 1011[57] Versatec Greensheet Interface}
-\major{85}{}{char }{Linux/SGI shared memory input queue}
-\major{86}{}{char }{SCSI media changer}
-\major{87}{}{char }{Sony Control-A1 stereo control bus}
-\major{88}{}{char }{COMX synchronous serial card}
-\major{  }{}{block}{Seventh IDE hard disk/CD-ROM interface}
-\major{89}{}{char }{I$^2$C bus interface}
-\major{  }{}{block}{Eighth IDE hard disk/CD-ROM interface}
-\major{90}{}{char }{Memory Technology Device (RAM, ROM, Flash)}
-\major{  }{}{block}{Ninth IDE hard disk/CD-ROM interface}
-\major{91}{}{char }{CAN-Bus controller}
-\major{  }{}{block}{Tenth IDE hard disk/CD-ROM interface}
-\major{92}{}{char }{Reserved for ith Kommunikationstechnik MIC ISDN card}
-\major{93}{}{char }{IBM Smart Capture Card frame grabber}
-\major{94}{}{char }{miroVIDEO DC10/30 capture/playback device}
-\major{95}{}{char }{IP filter}
-\major{96}{}{char }{Parallel port ATAPI tape devices}
-\major{97}{}{char }{Parallel port generic ATAPI interface}
-\major{98}{}{char }{Control and Mesurement Device (comedi)}
-\major{99}{}{char }{Raw parallel ports}
-\major{100}{}{char }{POTS (analogue telephone) A/B port}
-\major{101}{}{char }{Motorola DSP 56xxx board}
-\major{102}{}{char }{Philips SAA5249 Teletext signal decoder}
-\major{103}{}{char }{Arla network file system}
-\major{104}{}{char }{Flash BIOS support}
-\major{105}{}{char }{Comtrol VS-1000 serial card}
-\major{106}{}{char }{Comtrol VS-1000 serial card -- alternate devices}
-\major{107}{}{char }{3Dfx Voodoo Graphics device}
-\major{108}{}{char }{Device independent PPP interface}
-\major{109}{}{char }{Reserved for logical volume manager}
-\major{110}{}{char }{miroMEDIA Surround board}
-\major{111}{--119}{}{Unallocated}
-\major{120}{--127}{}{Local/experimental use}
-\major{128}{--135}{char }{Unix98 PTY masters}
-\major{136}{--143}{char }{Unix98 PTY slaves}
-\major{144}{--239}{}{Unallocated}
-\major{240}{--254}{}{Local/experimental use}
-\major{255}{}{}{Reserved}
-\end{devicelist}
-
-\section{Minor numbers}
-
-\begin{devicelist}
-\major{ 0}{}{}{Unnamed devices (e.g. non-device mounts)}
-	\minor{0}{}{reserved as null device number}
-\end{devicelist}
-
-\begin{devicelist}
-\major{ 1}{}{char}{Memory devices}
-	\minor{1}{/dev/mem}{Physical memory access}
-	\minor{2}{/dev/kmem}{Kernel virtual memory access}
-	\minor{3}{/dev/null}{Null device}
-	\minor{4}{/dev/port}{I/O port access}
-	\minor{5}{/dev/zero}{Null byte source}
-	\minor{6}{/dev/core}{OBSOLETE -- should be a link to {\file /proc/kcore}}
-	\minor{7}{/dev/full}{Returns ENOSPC on write}
-	\minor{8}{/dev/random}{Nondeterministic random number generator}
-	\minor{9}{/dev/urandom}{Less secure, but faster random number generator}
-\\
-\major{}{}{block}{RAM disk}
-	\minor{0}{/dev/ram0}{First RAM disk}
-	\minordots
-	\minor{7}{/dev/ram7}{Eighth RAM disk}
-	\minor{250}{/dev/initrd}{Initial RAM disk}
-\end{devicelist}
-
-\noindent
-Earlier kernels had {\file /dev/ramdisk} (1, 1) here.  {\file /dev/initrd}
-refers to a RAM disk which was preloaded by the boot loader.
-
-\begin{devicelist}
-\major{ 2}{}{char}{Pseudo-TTY masters}
-	\minor{0}{/dev/ptyp0}{First PTY master}
-	\minor{1}{/dev/ptyp1}{Second PTY master}
-	\minordots
-	\minor{255}{/dev/ptyef}{256th PTY master}
-\end{devicelist}
-
-\noindent
-Pseudo-TTY's are named as follows:
-\begin{itemize}
-\item Masters are {\file pty}, slaves are {\file tty};
-\item the fourth letter is one of {\file pqrstuvwxyzabcde} indicating
-the 1st through 16th series of 16 pseudo-ttys each, and
-\item the fifth letter is one of {\file 0123456789abcdef} indicating
-the position within the series.
-\end{itemize}
-
-\noindent
-These are the old-style (BSD) PTY devices; Unix98 devices are on major
-128 and above and use the PTY master multiplex ({\file /dev/ptmx}) to
-acquire a PTY on demand.
-
-\begin{devicelist}
-\major{}{}{block}{Floppy disks}
-	\minor{0}{/dev/fd0}{Controller 1, drive 1 autodetect}
-	\minor{1}{/dev/fd1}{Controller 1, drive 2 autodetect}
-	\minor{2}{/dev/fd2}{Controller 1, drive 3 autodetect}
-	\minor{3}{/dev/fd3}{Controller 1, drive 4 autodetect}
-	\minor{128}{/dev/fd4}{Controller 2, drive 1 autodetect}
-	\minor{129}{/dev/fd5}{Controller 2, drive 2 autodetect}
-	\minor{130}{/dev/fd6}{Controller 2, drive 3 autodetect}
-	\minor{131}{/dev/fd7}{Controller 2, drive 4 autodetect}
-\\
-\major{}{}{}{To specify format, add to the autodetect device number}
-	\minor{  0}{/dev/fd?}{Autodetect format}
-	\minor{}{}{}
-	\minor{  4}{/dev/fd?d360}{5.25\tum\ \num{4}{360}K in a \num{4}{360}K drive\1}
-	\minor{ 20}{/dev/fd?h360}{5.25\tum\ \num{4}{360}K in a 1200K drive\1}
-	\minor{ 48}{/dev/fd?h410}{5.25\tum\ \num{4}{410}K in a 1200K drive}
-	\minor{ 64}{/dev/fd?h420}{5.25\tum\ \num{4}{420}K in a 1200K drive}
-	\minor{ 24}{/dev/fd?h720}{5.25\tum\ \num{4}{720}K in a 1200K drive}
-	\minor{ 80}{/dev/fd?h880}{5.25\tum\ \num{4}{880}K in a 1200K drive\1}
-	\minor{  8}{/dev/fd?h1200}{5.25\tum\ 1200K in a 1200K drive\1}
-	\minor{ 40}{/dev/fd?h1440}{5.25\tum\ 1440K in a 1200K drive\1}
-	\minor{ 56}{/dev/fd?h1476}{5.25\tum\ 1476K in a 1200K drive}
-	\minor{ 72}{/dev/fd?h1494}{5.25\tum\ 1494K in a 1200K drive}
-	\minor{ 92}{/dev/fd?h1600}{5.25\tum\ 1600K in a 1200K drive\1}
-	\minor{}{}{}
-	\minor{ 12}{/dev/fd?u360}{3.5\tum\ \num{4}{360}K Double Density\2}
-	\minor{ 16}{/dev/fd?u720}{3.5\tum\ \num{4}{720}K Double Density\1}
-	\minor{120}{/dev/fd?u800}{3.5\tum\ \num{4}{800}K Double Density\2}
-	\minor{ 52}{/dev/fd?u820}{3.5\tum\ \num{4}{820}K Double Density}
-	\minor{ 68}{/dev/fd?u830}{3.5\tum\ \num{4}{830}K Double Density}
-	\minor{ 84}{/dev/fd?u1040}{3.5\tum\ 1040K Double Density\1}
-	\minor{ 88}{/dev/fd?u1120}{3.5\tum\ 1120K Double Density\1}
-	\minor{ 28}{/dev/fd?u1440}{3.5\tum\ 1440K High Density\1}
-	\minor{124}{/dev/fd?u1600}{3.5\tum\ 1600K High Density\1}
-	\minor{ 44}{/dev/fd?u1680}{3.5\tum\ 1680K High Density\3}
-	\minor{ 60}{/dev/fd?u1722}{3.5\tum\ 1722K High Density}
-	\minor{ 76}{/dev/fd?u1743}{3.5\tum\ 1743K High Density}
-	\minor{ 96}{/dev/fd?u1760}{3.5\tum\ 1760K High Density}
-	\minor{116}{/dev/fd?u1840}{3.5\tum\ 1840K High Density\3}
-	\minor{100}{/dev/fd?u1920}{3.5\tum\ 1920K High Density\1}
-	\minor{ 32}{/dev/fd?u2880}{3.5\tum\ 2880K Extra Density\1}
-	\minor{104}{/dev/fd?u3200}{3.5\tum\ 3200K Extra Density}
-	\minor{108}{/dev/fd?u3520}{3.5\tum\ 3520K Extra Density}
-	\minor{112}{/dev/fd?u3840}{3.5\tum\ 3840K Extra Density\1}
-	\minor{}{}{}
-	\minor{36}{/dev/fd?CompaQ}{Compaq 2880K drive; probably obsolete}
-\\
-\major{}{}{}{\1 Autodetectable format}
-\major{}{}{}{\2 Autodetectable format in a Double Density (720K) drive only}
-\major{}{}{}{\3 Autodetectable format in a High Density (1440K) drive only}
-\end{devicelist}
-
-NOTE: The letter in the device name ({\file d}, {\file q}, {\file h}
-or {\file u}) signifies the type of drive supported: 5.25\tum\ Double
-Density ({\file d}), 5.25\tum\ Quad Density ({\file q}), 5.25\tum\
-High Density ({\file h}) or 3.5\tum\ (any type, {\file u}).  The
-capital letters {\file D}, {\file H}, or {\file E} for the 3.5\tum\
-models have been deprecated, since the drive type is insignificant for
-these devices.
-
-\begin{devicelist}
-\major{ 3}{}{char}{Pseudo-TTY slaves}
-	\minor{0}{/dev/ttyp0}{First PTY slave}
-	\minor{1}{/dev/ttyp1}{Second PTY slave}
-	\minordots
-	\minor{255}{/dev/ttyef}{256th PTY slave}
-\end{devicelist}
-
-\noindent
-These are the old-style (BSD) PTY devices; Unix98 devices are on major
-136 and above.
-
-\begin{devicelist}
-\major{}{}{block}{First MFM, RLL and IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hda}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdb}{Slave: whole disk (or CD-ROM)}
-\\
-\major{}{}{}{For partitions, add to the whole disk device number}
-	\minor{0}{/dev/hd?}{Whole disk}
-	\minor{1}{/dev/hd?1}{First partition}
-	\minor{2}{/dev/hd?2}{Second partition}
-	\minordots
-	\minor{63}{/dev/hd?63}{63rd partition}
-\end{devicelist}
-
-\noindent
-For MS-DOS style partition tables (typically used by Linux/i386 and
-sometimes on Linux/Alpha), partitions 1-4 are the primary partitions,
-partitions 5 and up are logical partitions.  For other partitioning
-schemes, the meaning of the numbers vary.
-
-\begin{devicelist}
-\major{ 4}{}{char }{TTY devices}
-	\minor{0}{/dev/tty0}{Current virtual console}
-	\minor{1}{/dev/tty1}{First virtual console}
-	\minordots
-	\minor{63}{/dev/tty63}{63rd virtual console}
-	\minor{64}{/dev/ttyS0}{First serial port}
-	\minordots
-	\minor{127}{/dev/ttyS63}{64th serial port}
-	\minor{128}{/dev/ptyp0}{OBSOLETE}
-	\minordots
-	\minor{191}{/dev/ptysf}{OBSOLETE}
-	\minor{192}{/dev/ttyp0}{OBSOLETE}
-	\minordots
-	\minor{255}{/dev/ttysf}{OBSOLETE}
-\end{devicelist}
-
-\noindent
-Older versions of the Linux kernel used this major number for BSD PTY
-devices.  As of Linux 2.1.115, this is no longer supported.  Use major
-numbers 2 and 3.
-
-\begin{devicelist}
-\major{ 5}{}{char }{Alternate TTY devices}
-	\minor{0}{/dev/tty}{Current TTY device}
-	\minor{1}{/dev/console}{System console}
-	\minor{2}{/dev/ptmx}{PTY master multiplex}
-	\minor{64}{/dev/cua0}{Callout device corresponding to {\file ttyS0}}
-	\minordots
-	\minor{127}{/dev/cua63}{Callout device corresponding to {\file ttyS63}}
-\end{devicelist}
-
-\noindent
-(5,1) is {\file /dev/console} starting with Linux 2.1.71.  See the
-section on terminal devices for more information on {\file /dev/console}.
-
-\begin{devicelist}
-\major{ 6}{}{char }{Parallel printer devices}
-	\minor{0}{/dev/lp0}{First parallel printer ({\hex 0x3bc})}
-	\minor{1}{/dev/lp1}{Second parallel printer ({\hex 0x378})}
-	\minor{2}{/dev/lp2}{Third parallel printer ({\hex 0x278})}
-\end{devicelist}
-
-\noindent
-Not all computers have the {\hex 0x3bc} parallel port, hence the
-"first" printer may be either {\file /dev/lp0} or {\file /dev/lp1}.
-
-\begin{devicelist}
-\major{ 7}{}{char }{Virtual console access devices}
-	\minor{0}{/dev/vcs}{Current vc text access}
-	\minor{1}{/dev/vcs1}{tty1 text access}
-	\minordots
-	\minor{63}{/dev/vcs63}{tty63 text access}
-	\minor{128}{/dev/vcsa}{Current vc text/attribute access}
-	\minor{129}{/dev/vcsa1}{tty1 text/attribute access}
-	\minordots
-	\minor{191}{/dev/vcsa63}{tty63 text/attribute access}
-\end{devicelist}
-
-\noindent
-NOTE: These devices permit both read and write access.
-
-\begin{devicelist}
-\major{  }{}{block}{Loopback devices}
-	\minor{0}{/dev/loop0}{First loopback device}
-	\minor{1}{/dev/loop1}{Second loopback device}
-	\minordots
-\end{devicelist}
-
-\noindent
-The loopback devices are used to mount filesystems not associated with
-block devices.  The binding to the loopback devices is handled by
-{\bf mount}(8) or {\bf losetup}(8).
-
-\begin{devicelist}
-\major{ 8}{}{block}{SCSI disk devices (0-15)}
-	\minor{0}{/dev/sda}{First SCSI disk whole disk}
-	\minor{16}{/dev/sdb}{Second SCSI disk whole disk}
-	\minor{32}{/dev/sdc}{Third SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sdp}{Sixteenth SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{ 9}{}{char }{SCSI tape devices}
-	\minor{0}{/dev/st0}{First SCSI tape, mode 0}
-	\minor{1}{/dev/st1}{Second SCSI tape, mode 0}
-	\minordots
-	\minor{32}{/dev/st0l}{First SCSI tape, mode 1}
-	\minor{33}{/dev/st1l}{Second SCSI tape, mode 1}
-	\minordots
-	\minor{64}{/dev/st0m}{First SCSI tape, mode 2}
-	\minor{65}{/dev/st1m}{Second SCSI tape, mode 2}
-	\minordots
-	\minor{96}{/dev/st0a}{First SCSI tape, mode 3}
-	\minor{97}{/dev/st1a}{Second SCSI tape, mode 4}
-	\minordots
-	\minor{128}{/dev/nst0}{First SCSI tape, mode 0, no rewind}
-	\minor{129}{/dev/nst1}{Second SCSI tape, mode 0, no rewind}
-	\minordots
-	\minor{160}{/dev/nst0l}{First SCSI tape, mode 1, no rewind}
-	\minor{161}{/dev/nst1l}{Second SCSI tape, mode 1, no rewind}
-	\minordots
-	\minor{192}{/dev/nst0m}{First SCSI tape, mode 2, no rewind}
-	\minor{193}{/dev/nst1m}{Second SCSI tape, mode 2, no rewind}
-	\minordots
-	\minor{224}{/dev/nst0a}{First SCSI tape, mode 3, no rewind}
-	\minor{225}{/dev/nst1a}{Second SCSI tape, mode 3, no rewind}
-	\minordots
-\end{devicelist}
-
-\noindent
-``No rewind'' refers to the omission of the default automatic rewind
-on device close.  The {\file MTREW} or {\file MTOFFL} ioctl()s can be
-used to rewind the tape regardless of the device used to access it.
-
-\begin{devicelist}
-\major{  }{}{block}{Metadisk (RAID) devices}
-	\minor{0}{/dev/md0}{First metadisk group}
-	\minor{1}{/dev/md1}{Second metadisk group}
-	\minordots
-\end{devicelist}
-
-\noindent
-The metadisk driver is used to span a filesystem across multiple
-physical disks.
-
-\begin{devicelist}
-\major{10}{}{char }{Non-serial mice, misc features}
-	\minor{0}{/dev/logibm}{Logitech bus mouse}
-	\minor{1}{/dev/psaux}{PS/2-style mouse port}
-	\minor{2}{/dev/inportbm}{Microsoft Inport bus mouse}
-	\minor{3}{/dev/atibm}{ATI XL bus mouse}
-	\minor{4}{/dev/jbm}{J-mouse}
-	\minor{4}{/dev/amigamouse}{Amiga mouse (68k/Amiga)}
-	\minor{5}{/dev/atarimouse}{Atari mouse}
-	\minor{6}{/dev/sunmouse}{Sun mouse}
-	\minor{7}{/dev/amigamouse1}{Second Amiga mouse}
-	\minor{8}{/dev/smouse}{Simple serial mouse driver}
-	\minor{9}{/dev/pc110pad}{IBM PC-110 digitizer pad}
-	\minor{128}{/dev/beep}{Fancy beep device}
-	\minor{129}{/dev/modreq}{Kernel module load request}
-	\minor{130}{/dev/watchdog}{Watchdog timer port}
-	\minor{131}{/dev/temperature}{Machine internal temperature}
-	\minor{132}{/dev/hwtrap}{Hardware fault trap}
-	\minor{133}{/dev/exttrp}{External device trap}
-	\minor{134}{/dev/apm\_bios}{Advanced Power Management BIOS}
-	\minor{135}{/dev/rtc}{Real Time Clock}
-	\minor{139}{/dev/openprom}{SPARC OpenBoot PROM}
-	\minor{140}{/dev/relay8}{Berkshire Products Octal relay card}
-	\minor{141}{/dev/relay16}{Berkshire Products ISO-16 relay card}
-	\minor{142}{/dev/msr}{x86 model specific registers}
-	\minor{143}{/dev/pciconf}{PCI configuration space}
-	\minor{144}{/dev/nvram}{Non-volatile configuration RAM}
-	\minor{145}{/dev/hfmodem}{Soundcard shortwave modem control}
-	\minor{146}{/dev/graphics}{Linux/SGI graphics device}
-	\minor{147}{/dev/opengl}{Linux/SGI OpenGL pipe}
-	\minor{148}{/dev/gfx}{Linux/SGI graphics effects device}
-	\minor{149}{/dev/input/mouse}{Linux/SGI Irix emulation mouse}
-	\minor{150}{/dev/input/keyboard}{Linux/SGI Irix emulation keyboard}
-	\minor{151}{/dev/led}{Front panel LEDs}
-	\minor{153}{/dev/mergemem}{Memory merge device}
-	\minor{154}{/dev/pmu}{Macintosh PowerBook power manager}
-\end{devicelist}
-
-\begin{devicelist}
-\major{11}{}{char }{Raw keyboard device}
-	\minor{0}{/dev/kbd}{Raw keyboard device}
-\end{devicelist}
-
-\noindent
-The raw keyboard device is used on Linux/SPARC only.
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI CD-ROM devices}
-	\minor{0}{/dev/sr0}{First SCSI CD-ROM}
-	\minor{1}{/dev/sr1}{Second SCSI CD-ROM}
-	\minordots
-\end{devicelist}
-
-\noindent
-The prefix {\file /dev/scd} instead of {\file /dev/sr} has been used
-as well, and might make more sense.
-
-\begin{devicelist}
-\major{12}{}{char }{QIC-02 tape}
-	\minor{2}{/dev/ntpqic11}{QIC-11, no rewind-on-close}
-	\minor{3}{/dev/tpqic11}{QIC-11, rewind-on-close}
-	\minor{4}{/dev/ntpqic24}{QIC-24, no rewind-on-close}
-	\minor{5}{/dev/tpqic24}{QIC-24, rewind-on-close}
-	\minor{6}{/dev/ntpqic120}{QIC-120, no rewind-on-close}
-	\minor{7}{/dev/tpqic120}{QIC-120, rewind-on-close}
-	\minor{8}{/dev/ntpqic150}{QIC-150, no rewind-on-close}
-	\minor{9}{/dev/tpqic150}{QIC-150, rewind-on-close}
-\end{devicelist}
-
-\noindent
-The device names specified are proposed -- if there are ``standard''
-names for these devices, please let me know.
-
-\begin{devicelist}
-\major{  }{}{block}{MSCDEX CD-ROM callback support}
-	\minor{0}{/dev/dos\_cd0}{First MSCDEX CD-ROM}
-	\minor{1}{/dev/dos\_cd1}{Second MSCDEX CD-ROM}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{13}{}{char }{PC speaker}
-	\minor{0}{/dev/pcmixer}{Emulates {\file /dev/mixer}}
-	\minor{3}{/dev/pcsp}{Emulates {\file /dev/dsp} (8-bit)}
-	\minor{4}{/dev/pcaudio}{Emulates {\file /dev/audio}}
-	\minor{5}{/dev/pcsp16}{Emulates {\file /dev/dsp} (16-bit)}
-\\
-\major{  }{}{block}{8-bit MFM/RLL/IDE controller}
-	\minor{0}{/dev/xda}{First XT disk whole disk}
-	\minor{64}{/dev/xdb}{Second XT disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3).
-
-\begin{devicelist}
-\major{14}{}{char }{Sound card}
-	\minor{0}{/dev/mixer}{Mixer control}
-	\minor{1}{/dev/sequencer}{Audio sequencer}
-	\minor{2}{/dev/midi00}{First MIDI port}
-	\minor{3}{/dev/dsp}{Digital audio}
-	\minor{4}{/dev/audio}{Sun-compatible digital audio}
-	\minor{6}{/dev/sndstat}{Sound card status information}
-	\minor{8}{/dev/sequencer2}{Sequencer -- alternate device}
-	\minor{16}{/dev/mixer1}{Second soundcard mixer control}
-	\minor{17}{/dev/patmgr0}{Sequencer patch manager}
-	\minor{18}{/dev/midi01}{Second MIDI port}
-	\minor{19}{/dev/dsp1}{Second soundcard digital audio}
-	\minor{20}{/dev/audio1}{Second soundcard Sun digital audio}
-	\minor{33}{/dev/patmgr1}{Sequencer patch manager}
-	\minor{34}{/dev/midi02}{Third MIDI port}
-	\minor{50}{/dev/midi03}{Fourth MIDI port}
-\\
-\major{  }{}{block}{BIOS harddrive callback support}
-	\minor{0}{/dev/dos\_hda}{First BIOS harddrive whole disk}
-	\minor{64}{/dev/dos\_hdb}{Second BIOS harddrive whole disk}
-	\minor{128}{/dev/dos\_hdc}{Third BIOS harddrive whole disk}
-	\minor{192}{/dev/dos\_hdd}{Fourth BIOS harddrive whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3).
-
-\begin{devicelist}
-\major{15}{}{char }{Joystick}
-	\minor{0}{/dev/js0}{First analog joystick}
-	\minor{1}{/dev/js1}{Second analog joystick}
-	\minordots
-	\minor{128}{/dev/djs0}{First digital joystick}
-	\minor{129}{/dev/djs1}{Second digital joystick}
-	\minordots
-\\
-\major{  }{}{block}{Sony CDU-31A/CDU-33A CD-ROM}
-	\minor{0}{/dev/sonycd}{Sony CDU-31A CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{16}{}{char }{Non-SCSI scanners}
-	\minor{0}{/dev/gs4500}{Genius 4500 handheld scanner}
-\\
-\major{  }{}{block}{GoldStar CD-ROM}
-	\minor{0}{/dev/gscd}{GoldStar CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{17}{}{char }{Chase serial card}
-	\minor{0}{/dev/ttyH0}{First Chase port}
-	\minor{1}{/dev/ttyH1}{Second Chase port}
-	\minordots
-\\
-\major{  }{}{block}{Optics Storage CD-ROM}
-	\minor{0}{/dev/optcd}{Optics Storage CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{18}{}{char }{Chase serial card -- alternate devices}
-	\minor{0}{/dev/cuh0}{Callout device corresponding to {\file ttyH0}}
-	\minor{1}{/dev/cuh1}{Callout device corresponding to {\file ttyH1}}
-	\minordots
-\\
-\major{  }{}{block}{Sanyo CD-ROM}
-	\minor{0}{/dev/sjcd}{Sanyo CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{19}{}{char }{Cyclades serial card}
-	\minor{0}{/dev/ttyC0}{First Cyclades port}
-	\minordots
-	\minor{31}{/dev/ttyC31}{32nd Cyclades port}
-\\
-\major{  }{}{block}{``Double'' compressed disk}
-	\minor{0}{/dev/double0}{First compressed disk}
-	\minordots
-	\minor{7}{/dev/double7}{Eighth compressed disk}
-	\minor{128}{/dev/cdouble0}{Mirror of first compressed disk}
-	\minordots
-	\minor{135}{/dev/cdouble7}{Mirror of eighth compressed disk}
-\end{devicelist}
-
-\noindent
-See the Double documentation for an explanation of the ``mirror'' devices.
-
-\begin{devicelist}
-\major{20}{}{char }{Cyclades serial card -- alternate devices}
-	\minor{0}{/dev/cub0}{Callout device corresponding to {\file ttyC0}}
-	\minordots
-	\minor{31}{/dev/cub31}{Callout device corresponding to {\file ttyC31}}
-\\
-\major{  }{}{block}{Hitachi CD-ROM}
-	\minor{0}{/dev/hitcd}{Hitachi CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{21}{}{char }{Generic SCSI access}
-	\minor{0}{/dev/sg0}{First generic SCSI device}
-	\minor{1}{/dev/sg1}{Second generic SCSI device}
-	\minordots
-\end{devicelist}
-
-\noindent
-Most distributions name these {\file /dev/sga}, {\file /dev/sgb}...
-This sets an unneccesary limit of 26 SCSI devices in the system, and
-is counter to standard Linux device-naming practice.
-
-\begin{devicelist}
-\major{  }{}{block }{Acorn MFM hard drive interface}
-	\minor{0}{/dev/mfma}{First MFM drive whole disk}
-	\minor{64}{/dev/mfmb}{Second MFM drive whole disk}
-\end{devicelist}
-
-\noindent
-This device is used on the ARM-based Acorn RiscPC.  Partitions are
-handled the same way as for IDE disks (see major number 3).
-
-\begin{devicelist}
-\major{22}{}{char }{Digiboard serial card}
-	\minor{0}{/dev/ttyD0}{First Digiboard port}
-	\minor{1}{/dev/ttyD1}{Second Digiboard port}
-	\minordots
-\\
-\major{  }{}{block}{Second IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hdc}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdd}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{23}{}{char }{Digiboard serial card -- alternate devices}
-	\minor{0}{/dev/cud0}{Callout device corresponding to {\file ttyD0}}
-	\minor{1}{/dev/cud1}{Callout device corresponding to {\file ttyD1}}
-	\minordots
-\major{  }{}{block}{Mitsumi proprietary CD-ROM}
-	\minor{0}{/dev/mcd}{Mitsumi CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}\
-\major{24}{}{char }{Stallion serial card}
-	\minor{0}{/dev/ttyE0}{Stallion port 0 board 0}
-	\minor{1}{/dev/ttyE1}{Stallion port 1 board 0}
-	\minordots
-	\minor{64}{/dev/ttyE64}{Stallion port 0 board 1}
-	\minor{65}{/dev/ttyE65}{Stallion port 1 board 1}
-	\minordots
-	\minor{128}{/dev/ttyE128}{Stallion port 0 board 2}
-	\minor{129}{/dev/ttyE129}{Stallion port 1 board 2}
-	\minordots
-	\minor{192}{/dev/ttyE192}{Stallion port 0 board 3}
-	\minor{193}{/dev/ttyE193}{Stallion port 1 board 3}
-	\minordots
-\\
-\major{  }{}{block}{Sony CDU-535 CD-ROM}
-	\minor{0}{/dev/cdu535}{Sony CDU-535 CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{25}{}{char }{Stallion serial card -- alternate devices}
-	\minor{0}{/dev/cue0}{Callout device corresponding to {\file ttyE0}}
-	\minor{1}{/dev/cue1}{Callout device corresponding to {\file ttyE1}}
-	\minordots
-	\minor{64}{/dev/cue64}{Callout device corresponding to {\file ttyE64}}
-	\minor{65}{/dev/cue65}{Callout device corresponding to {\file ttyE65}}
-	\minordots
-	\minor{128}{/dev/cue128}{Callout device corresponding to {\file ttyE128}}
-	\minor{129}{/dev/cue129}{Callout device corresponding to {\file ttyE129}}
-	\minordots
-	\minor{192}{/dev/cue192}{Callout device corresponding to {\file ttyE192}}
-	\minor{193}{/dev/cue193}{Callout device corresponding to {\file ttyE193}}
-	\minordots
-\\
-\major{  }{}{block}{First Matsushita (Panasonic/SoundBlaster) CD-ROM}
-	\minor{0}{/dev/sbpcd0}{Panasonic CD-ROM controller 0 unit 0}
-	\minor{1}{/dev/sbpcd1}{Panasonic CD-ROM controller 0 unit 1}
-	\minor{2}{/dev/sbpcd2}{Panasonic CD-ROM controller 0 unit 2}
-	\minor{3}{/dev/sbpcd3}{Panasonic CD-ROM controller 0 unit 3}
-\end{devicelist}
-
-\begin{devicelist}
-\major{26}{}{char }{Quanta WinVision frame grabber}
-	\minor{0}{/dev/wvisfgrab}{Quanta WinVision frame grabber}
-\\
-\major{  }{}{block}{Second Matsushita (Panasonic/SoundBlaster) CD-ROM}
-	\minor{0}{/dev/sbpcd4}{Panasonic CD-ROM controller 1 unit 0}
-	\minor{1}{/dev/sbpcd5}{Panasonic CD-ROM controller 1 unit 1}
-	\minor{2}{/dev/sbpcd6}{Panasonic CD-ROM controller 1 unit 2}
-	\minor{3}{/dev/sbpcd7}{Panasonic CD-ROM controller 1 unit 3}
-\end{devicelist}
-
-\begin{devicelist}
-\major{27}{}{char }{QIC-117 tape}
-	\minor{0}{/dev/qft0}{Unit 0, rewind-on-close}
-	\minor{1}{/dev/qft1}{Unit 1, rewind-on-close}
-	\minor{2}{/dev/qft2}{Unit 2, rewind-on-close}
-	\minor{3}{/dev/qft3}{Unit 3, rewind-on-close}
-	\minor{4}{/dev/nqft0}{Unit 0, no rewind-on-close}
-	\minor{5}{/dev/nqft1}{Unit 1, no rewind-on-close}
-	\minor{6}{/dev/nqft2}{Unit 2, no rewind-on-close}
-	\minor{7}{/dev/nqft3}{Unit 3, no rewind-on-close}
-	\minor{16}{/dev/zqft0}{Unit 0, rewind-on-close, compression}
-	\minor{17}{/dev/zqft1}{Unit 1, rewind-on-close, compression}
-	\minor{18}{/dev/zqft2}{Unit 2, rewind-on-close, compression}
-	\minor{19}{/dev/zqft3}{Unit 3, rewind-on-close, compression}
-	\minor{20}{/dev/nzqft0}{Unit 0, no rewind-on-close, compression}
-	\minor{21}{/dev/nzqft1}{Unit 1, no rewind-on-close, compression}
-	\minor{22}{/dev/nzqft2}{Unit 2, no rewind-on-close, compression}
-	\minor{23}{/dev/nzqft3}{Unit 3, no rewind-on-close, compression}
-	\minor{32}{/dev/rawqft0}{Unit 0, rewind-on-close, no file marks}
-	\minor{33}{/dev/rawqft1}{Unit 1, rewind-on-close, no file marks}
-	\minor{34}{/dev/rawqft2}{Unit 2, rewind-on-close, no file marks}
-	\minor{35}{/dev/rawqft3}{Unit 3, rewind-on-close, no file marks}
-	\minor{36}{/dev/nrawqft0}{Unit 0, no rewind-on-close, no file marks}
-	\minor{37}{/dev/nrawqft1}{Unit 1, no rewind-on-close, no file marks}
-	\minor{38}{/dev/nrawqft2}{Unit 2, no rewind-on-close, no file marks}
-	\minor{39}{/dev/nrawqft3}{Unit 3, no rewind-on-close, no file marks}
-\\
-\major{  }{}{block}{Third Matsushita (Panasonic/SoundBlaster) CD-ROM}
-	\minor{0}{/dev/sbpcd8}{Panasonic CD-ROM controller 2 unit 0}
-	\minor{1}{/dev/sbpcd9}{Panasonic CD-ROM controller 2 unit 1}
-	\minor{2}{/dev/sbpcd10}{Panasonic CD-ROM controller 2 unit 2}
-	\minor{3}{/dev/sbpcd11}{Panasonic CD-ROM controller 2 unit 3}
-\end{devicelist}
-
-\begin{devicelist}
-\major{28}{}{char }{Stallion serial card -- card programming}
-	\minor{0}{/dev/staliomem0}{First Stallion I/O card memory}
-	\minor{1}{/dev/staliomem1}{Second Stallion I/O card memory}
-	\minor{2}{/dev/staliomem2}{Third Stallion I/O card memory}
-	\minor{3}{/dev/staliomem3}{Fourth Stallion I/O card memory}
-\\
-\major{  }{}{char }{Atari SLM ACSI laser printer (68k/Atari)}
-	\minor{0}{/dev/slm0}{First SLM laser printer}
-	\minor{1}{/dev/slm1}{Second SLM laser printer}
-	\minordots
-\\
-\major{  }{}{block}{Fourth Matsushita (Panasonic/SoundBlaster) CD-ROM}
-	\minor{0}{/dev/sbpcd12}{Panasonic CD-ROM controller 3 unit 0}
-	\minor{1}{/dev/sbpcd13}{Panasonic CD-ROM controller 3 unit 1}
-	\minor{2}{/dev/sbpcd14}{Panasonic CD-ROM controller 3 unit 2}
-	\minor{3}{/dev/sbpcd15}{Panasonic CD-ROM controller 3 unit 3}
-\\
-\major{  }{}{block}{ACSI disk/CD-ROM (68k/Atari)}
-	\minor{0}{/dev/ada}{First ACSI disk whole disk}
-	\minor{16}{/dev/adb}{Second ACSI disk whole disk}
-	\minor{32}{/dev/adc}{Third ACSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/adp}{Sixteenth ACSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk (same as SCSI.)
-
-\begin{devicelist}
-\major{29}{}{char }{Universal frame buffer}
-	\minor{0}{/dev/fb0}{First frame buffer}
-	\minor{1}{/dev/fb1}{Second frame buffer}
-	\minor{2}{/dev/fb2}{Third frame buffer}
-	\minordots
-	\minor{31}{/dev/fb31}{32nd frame buffer}
-\end{devicelist}
-
-\noindent
-All additional minor device numbers are reserved.
-
-\begin{devicelist}
-\major{  }{}{block}{Aztech/Orchid/Okano/Wearnes CD-ROM}
-	\minor{0}{/dev/aztcd}{Aztech CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{30}{}{char }{iBCS-2 compatibility devices}
-	\minor{0}{/dev/socksys}{Socket access}
-	\minor{1}{/dev/spx}{SVR3 local X interface}
-	\minor{2}{/dev/inet/arp}{Network access}
-	\minor{2}{/dev/inet/icmp}{Network access}
-	\minor{2}{/dev/inet/ip}{Network access}
-	\minor{2}{/dev/inet/udp}{Network access}
-	\minor{2}{/dev/inet/tcp}{Network access}
-\end{devicelist}
-
-\noindent
-Additionally, iBCS-2 requires {\file /dev/nfsd} to be a link to {\file
-/dev/socksys} and {\file /dev/X0R} to be a link to {\file /dev/null}.
-
-\begin{devicelist}
-\major{  }{}{block}{Philips LMS CM-205 CD-ROM}
-	\minor{0}{/dev/cm205cd}{Philips LMS CM-205 CD-ROM}
-\end{devicelist}
-
-\noindent
-{\file /dev/lmscd} is an older name for this drive.  This driver does
-not work with the CM-205MS CD-ROM.
-
-\begin{devicelist}
-\major{31}{}{char }{MPU-401 MIDI}
-	\minor{0}{/dev/mpu401data}{MPU-401 data port}
-	\minor{1}{/dev/mpu401stat}{MPU-401 status port}
-\\
-\major{  }{}{block}{ROM/flash memory card}
-	\minor{0}{/dev/rom0}{First ROM card (rw)}
-	\minordots
-	\minor{7}{/dev/rom7}{Eighth ROM card (rw)}
-	\minor{8}{/dev/rrom0}{First ROM card (ro)}
-	\minordots
-	\minor{15}{/dev/rrom0}{Eighth ROM card (ro)}
-	\minor{16}{/dev/flash0}{First flash memory card (rw)}
-	\minordots
-	\minor{23}{/dev/flash7}{Eighth flash memory card (rw)}
-	\minor{24}{/dev/rflash0}{First flash memory card (ro)}
-	\minordots
-	\minor{31}{/dev/rflash7}{Eighth flash memory card (ro)}
-\end{devicelist}
-
-\noindent
-The read-write (rw) devices support back-caching written data in RAM,
-as well as writing to flash RAM devices.  The read-only devices (ro)
-support reading only.
-
-\begin{devicelist}
-\major{32}{}{char }{Specialix serial card}
-	\minor{0}{/dev/ttyX0}{First Specialix port}
-	\minor{1}{/dev/ttyX1}{Second Specialix port}
-	\minordots
-\\
-\major{  }{}{block}{Philips LMS CM-206 CD-ROM}
-	\minor{0}{/dev/cm206cd}{Philips LMS CM-206 CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{33}{}{char }{Specialix serial card -- alternate devices}
-	\minor{0}{/dev/cux0}{Callout device corresponding to {\file ttyX0}}
-	\minor{1}{/dev/cux1}{Callout device corresponding to {\file ttyX1}}
-	\minordots
-\\
-\major{  }{}{block}{Third IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hde}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdf}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{34}{}{char }{Z8530 HDLC driver}
-	\minor{0}{/dev/scc0}{First Z8530, first port}
-	\minor{1}{/dev/scc1}{First Z8530, second port}
-	\minor{2}{/dev/scc2}{Second Z8530, first port}
-	\minor{3}{/dev/scc3}{Second Z8530, second port}
-	\minordots
-\end{devicelist}
-
-\noindent
-In a previous version these devices were named {\file /dev/sc1} for
-{\file /dev/scc0}, {\file /dev/sc2} for {\file /dev/scc1}, and so on.
-
-\begin{devicelist}
-\major{  }{}{block}{Fourth IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hdg}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdh}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{35}{}{char }{tclmidi MIDI driver}
-	\minor{0}{/dev/midi0}{First MIDI port, kernel timed}
-	\minor{1}{/dev/midi1}{Second MIDI port, kernel timed}
-	\minor{2}{/dev/midi2}{Third MIDI port, kernel timed}
-	\minor{3}{/dev/midi3}{Fourth MIDI port, kernel timed}
-	\minor{64}{/dev/rmidi0}{First MIDI port, untimed}
-	\minor{65}{/dev/rmidi1}{Second MIDI port, untimed}
-	\minor{66}{/dev/rmidi2}{Third MIDI port, untimed}
-	\minor{67}{/dev/rmidi3}{Fourth MIDI port, untimed}
-	\minor{128}{/dev/smpte0}{First MIDI port, SMPTE timed}
-	\minor{129}{/dev/smpte1}{Second MIDI port, SMPTE timed}
-	\minor{130}{/dev/smpte2}{Third MIDI port, SMPTE timed}
-	\minor{131}{/dev/smpte3}{Fourth MIDI port, SMPTE timed}
-\\
-\major{  }{}{block}{Slow memory ramdisk}
-	\minor{0}{/dev/slram}{Slow memory ramdisk}
-\end{devicelist}
-
-\begin{devicelist}
-\major{36}{}{char }{Netlink support}
-	\minor{0}{/dev/route}{Routing, device updates (kernel to user)}
-	\minor{1}{/dev/skip}{enSKIP security cache control}
-\\
-\major{  }{}{block}{MCA ESDI hard disk}
-	\minor{0}{/dev/eda}{First ESDI disk whole disk}
-	\minor{64}{/dev/edb}{Second ESDI disk whole disk}
-	\minordots
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for IDE disks (see major number
-3).
-
-\begin{devicelist}
-\major{37}{}{char }{IDE tape}
-	\minor{0}{/dev/ht0}{First IDE tape}
-	\minor{128}{/dev/nht0}{First IDE tape, no rewind-on-close}
-\end{devicelist}
-
-\noindent
-Currently, only one IDE tape drive is supported.
-
-\begin{devicelist}
-\major{  }{}{block}{Zorro II ramdisk}
-	\minor{0}{/dev/z2ram}{Zorro II ramdisk}
-\end{devicelist}
-
-\begin{devicelist}
-\major{38}{}{char }{Myricom PCI Myrinet board}
-	\minor{0}{/dev/mlanai0}{First Myrinet board}
-	\minor{1}{/dev/mlanai1}{Second Myrinet board}
-	\minordots
-\end{devicelist}
-
-\noindent
-This device is used for board control, status query and ``user level
-packet I/O''.  The board is also accessible as a regular {\file eth}
-networking device.
-
-\begin{devicelist}
-\major{  }{}{block}{Reserved for Linux/AP+}
-\end{devicelist}
-
-\begin{devicelist}
-\major{39}{}{char }{ML-16P experimental I/O board}
-	\minor{0}{/dev/ml16pa-a0}{First card, first analog channel}
-	\minor{1}{/dev/ml16pa-a1}{First card, second analog channel}
-	\minordots
-	\minor{15}{/dev/ml16pa-a15}{First card, 16th analog channel}
-	\minor{16}{/dev/ml16pa-d}{First card, digital lines}
-	\minor{17}{/dev/ml16pa-c0}{First card, first counter/timer}
-	\minor{18}{/dev/ml16pa-c1}{First card, second counter/timer}
-	\minor{19}{/dev/ml16pa-c2}{First card, third counter/timer}
-	\minor{32}{/dev/ml16pb-a0}{Second card, first analog channel}
-	\minor{33}{/dev/ml16pb-a1}{Second card, second analog channel}
-	\minordots
-	\minor{47}{/dev/ml16pb-a15}{Second card, 16th analog channel}
-	\minor{48}{/dev/ml16pb-d}{Second card, digital lines}
-	\minor{49}{/dev/ml16pb-c0}{Second card, first counter/timer}
-	\minor{50}{/dev/ml16pb-c1}{Second card, second counter/timer}
-	\minor{51}{/dev/ml16pb-c2}{Second card, third counter/timer}
-	\minordots
-\\
-\major{  }{}{block}{Reserved for Linux/AP+}
-\end{devicelist}
-
-\begin{devicelist}
-\major{40}{}{char }{Matrox Meteor frame grabber}
-	\minor{0}{/dev/mmetfgrab}{Matrox Meteor frame grabber}
-\\
-\major{  }{}{block}{Syquest EZ135 parallel port removable drive}
-	\minor{0}{/dev/eza}{Parallel EZ135 drive whole disk}
-\end{devicelist}
-
-\noindent
-This device is obsolete and will be removed in a future version of
-Linux.  It has been replaced with the parallel port IDE disk driver at
-major number 45.  Partitions are handled the same way as for IDE disks
-(see major number 3).
-
-\begin{devicelist}
-\major{41}{}{char }{Yet Another Micro Monitor}
-	\minor{0}{/dev/yamm}{Yet Another Micro Monitor}
-\\
-\major{  }{}{block}{MicroSolutions BackPack parallel port CD-ROM}
-	\minor{0}{/dev/bpcd}{BackPack CD-ROM}
-\end{devicelist}
-
-\noindent
-This device is obsolete and will be removed in a future version of
-Linux.  It has been replaced with the parallel port ATAPI CD-ROM
-driver at major number 46.
-
-\begin{devicelist}
-\major{42}{}{}{Demo/sample use}
-\end{devicelist}
-
-\noindent
-This number is intended for use in sample code, as well as a general
-``example'' device number.  It should never be used for a device
-driver that is being distributed; either obtain an official number or
-use the local/experimental range.  The sudden addition or removal of a
-driver with this number should not cause ill effects to the system
-(bugs excepted.)
-
-IN PARTICULAR, ANY DISTRIBUTION WHICH CONTAINS A DEVICE DRIVER USING
-MAJOR NUMBER 42 IS NONCOMPLIANT.
-
-\begin{devicelist}
-\major{43}{}{char }{isdn4linux virtual modem}
-	\minor{0}{/dev/ttyI0}{First virtual modem}
-	\minordots
-	\minor{63}{/dev/ttyI63}{64th virtual modem}
-\\
-\major{  }{}{block}{Network block devices}
-	\minor{0}{/dev/nd0}{First network block device}
-	\minor{1}{/dev/nd1}{Second network block device}
-	\minordots
-\end{devicelist}
-
-\noindent
-Network Block Device is somehow similar to loopback devices: If you
-read from it, it sends packet accross network asking server for
-data. If you write to it, it sends packet telling server to write. It
-could be used to mounting filesystems over the net, swapping over the
-net, implementing block device in userland etc.
-
-\begin{devicelist}
-\major{44}{}{char }{isdn4linux virtual modem -- alternate devices}
-	\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}
-	\minordots
-	\minor{63}{/dev/isdn63}{64th virtual B channel raw data}
-	\minor{64}{/dev/isdnctrl0}{First channel control/debug}
-	\minordots
-	\minor{127}{/dev/isdnctrl63}{64th channel control/debug}
-	\minor{128}{/dev/ippp0}{First SyncPPP device}
-	\minordots
-	\minor{191}{/dev/ippp63}{64th SyncPPP device}
-	\minor{255}{/dev/isdninfo}{ISDN monitor interface}
-\\
-\major{  }{}{block}{Parallel port IDE disk devices}
-	\minor{0}{/dev/pda}{First parallel port IDE disk}
-	\minor{16}{/dev/pdb}{Second parallel port IDE disk}
-	\minor{32}{/dev/pdc}{Third parallel port IDE disk}
-	\minor{48}{/dev/pdd}{Fourth parallel port IDE disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{46}{}{char }{Comtrol Rocketport serial card}
-	\minor{0}{/dev/ttyR0}{First Rocketport port}
-	\minor{1}{/dev/ttyR1}{Second Rocketport port}
-	\minordots
-\\
-\major{  }{}{block}{Parallel port ATAPI CD-ROM devices}
-	\minor{0}{/dev/pcd0}{First parallel port ATAPI CD-ROM}
-	\minor{1}{/dev/pcd1}{Second parallel port ATAPI CD-ROM}
-	\minor{2}{/dev/pcd2}{Third parallel port ATAPI CD-ROM}
-	\minor{3}{/dev/pcd3}{Fourth parallel port ATAPI CD-ROM}
-\end{devicelist}
-
-\begin{devicelist}
-\major{47}{}{char }{Comtrol Rocketport serial card -- alternate devices}
-	\minor{0}{/dev/cur0}{Callout device corresponding to {\file ttyR0}}
-	\minor{1}{/dev/cur1}{Callout device corresponding to {\file ttyR1}}
-	\minordots
-\\
-\major{  }{}{block}{Parallel port ATAPI disk devices}
-	\minor{0}{/dev/pf0}{First parallel port ATAPI disk}
-	\minor{1}{/dev/pf1}{Second parallel port ATAPI disk}
-	\minor{2}{/dev/pf2}{Third parallel port ATAPI disk}
-	\minor{3}{/dev/pf3}{Fourth parallel port ATAPI disk}
-\end{devicelist}
-
-\noindent
-This driver is intended for floppy disks and similar devices and hence
-does not support partitioning.
-
-\begin{devicelist}
-\major{48}{}{char }{SDL RISCom serial card}
-	\minor{0}{/dev/ttyL0}{First RISCom port}
-	\minor{1}{/dev/ttyL1}{Second RISCom port}
-	\minordots
-\\
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{49}{}{char }{SDL RISCom serial card -- alternate devices}
-	\minor{0}{/dev/cul0}{Callout device corresponding to {\file ttyL0}}
-	\minor{1}{/dev/cul1}{Callout device corresponding to {\file ttyL1}}
-	\minordots
-\\
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{50}{}{char}{Reserved for GLINT}
-\\
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{51}{}{char }{Baycom radio modem}
-	\minor{0}{/dev/bc0}{First Baycom radio modem}
-	\minor{1}{/dev/bc1}{Second Baycom radio modem}
-	\minordots
-\\
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{52}{}{char }{Spellcaster DataComm/BRI ISDN card}
-	\minor{0}{/dev/dcbri0}{First DataComm card}
-	\minor{1}{/dev/dcbri1}{Second DataComm card}
-	\minor{2}{/dev/dcbri2}{Third DataComm card}
-	\minor{3}{/dev/dcbri3}{Fourth DataComm card}
-\\
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{53}{}{char }{BDM interface for remote debugging MC683xx microcontrollers}
-	\minor{0}{/dev/pd\_bdm0}{PD BDM interface on {\file lp0}}
-	\minor{1}{/dev/pd\_bdm1}{PD BDM interface on {\file lp1}}
-	\minor{2}{/dev/pd\_bdm2}{PD BDM interface on {\file lp2}}
-	\minor{4}{/dev/icd\_bdm0}{ICD BDM interface on {\file lp0}}
-	\minor{5}{/dev/icd\_bdm1}{ICD BDM interface on {\file lp1}}
-	\minor{6}{/dev/icd\_bdm2}{ICD BDM interface on {\file lp2}}
-\end{devicelist}
-
-\noindent
-This device is used for the interfacing to the MC683xx
-microcontrollers via Background Debug Mode by use of a Parallel Port
-interface. PD is the Motorola Public Domain Interface and ICD is the
-commercial interface by P\&E.
-
-\begin{devicelist}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{54}{}{char }{Electrocardiognosis Holter serial card}
-	\minor{0}{/dev/holter0}{First Holter port}
-	\minor{1}{/dev/holter1}{Second Holter port}
-	\minor{2}{/dev/holter2}{Third Holter port}
-\end{devicelist}
-
-\noindent
-A custom serial card used by Electrocardiognosis SRL
-$<$mseritan@ottonel.pub.ro$>$ to transfer data from Holter 24-hour
-heart monitoring equipment.
-
-\begin{devicelist}
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{55}{}{char }{DSP56001 digital signal processor}
-	\minor{0}{/dev/dsp56k}{First DSP56001}
-\\
-\major{  }{}{block}{Reserved for Mylex DAC960 PCI RAID Controller}
-\end{devicelist}
-
-\begin{devicelist}
-\major{56}{}{char }{Apple Desktop Bus}
-	\minor{0}{/dev/adb}{ADB bus control}
-\end{devicelist}
-
-\noindent
-Additional devices will be added to this number, all starting with
-{\file /dev/adb}.
-
-\begin{devicelist}
-\major{  }{}{block}{Fifth IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hdi}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdj}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{57}{}{char }{Hayes ESP serial card}
-	\minor{0}{/dev/ttyP0}{First ESP port}
-	\minor{1}{/dev/ttyP1}{Second ESP port}
-	\minordots
-\\
-\major{  }{}{block}{Sixth IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hdk}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdl}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{58}{}{char }{Hayes ESP serial card -- alternate devices}
-	\minor{0}{/dev/cup0}{Callout device corresponding to {\file ttyP0}}
-	\minor{1}{/dev/cup1}{Callout device corresponding to {\file ttyP1}}
-	\minordots
-\\
-\major{  }{}{block}{Reserved for logical volume manager}
-\end{devicelist}
-
-\begin{devicelist}
-\major{59}{}{char }{sf firewall package}
-	\minor{0}{/dev/firewall}{Communication with sf kernel module}
-\end{devicelist}
-
-\begin{devicelist}
-\major{60}{--63}{}{Local/experimental use}
-\end{devicelist}
-
-\noindent
-For devices not assigned official numbers, these ranges should be
-used, in order to avoid conflict with future assignments.
-
-\begin{devicelist}
-\major{64}{}{char }{ENskip kernel encryption package}
-	\minor{0}{/dev/enskip}{Communication with ENskip kernel
-	module}
-\end{devicelist}
-
-\begin{devicelist}
-\major{65}{}{char }{Sundance ``plink'' Transputer boards}
-	\minor{0}{/dev/plink0}{First plink device}
-	\minor{1}{/dev/plink1}{Second plink device}
-	\minor{2}{/dev/plink2}{Third plink device}
-	\minor{3}{/dev/plink3}{Fourth plink device}
-	\minor{64}{/dev/rplink0}{First plink device, raw}
-	\minor{65}{/dev/rplink1}{Second plink device, raw}
-	\minor{66}{/dev/rplink2}{Third plink device, raw}
-	\minor{67}{/dev/rplink3}{Fourth plink device, raw}
-	\minor{128}{/dev/plink0d}{First plink device, debug}
-	\minor{129}{/dev/plink1d}{Second plink device, debug}
-	\minor{130}{/dev/plink2d}{Third plink device, debug}
-	\minor{131}{/dev/plink3d}{Fourth plink device, debug}
-	\minor{192}{/dev/rplink0d}{First plink device, raw, debug}
-	\minor{193}{/dev/rplink1d}{Second plink device, raw, debug}
-	\minor{194}{/dev/rplink2d}{Third plink device, raw, debug}
-	\minor{195}{/dev/rplink3d}{Fourth plink device, raw, debug}
-\end{devicelist}
-
-\noindent
-This is a commercial driver; contact James Howes
-$<$jth@prosig.demon.co.uk$>$ for information. 
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (16-31)}
-	\minor{0}{/dev/sdq}{17th SCSI disk whole disk}
-	\minor{16}{/dev/sdr}{18th SCSI disk whole disk}
-	\minor{32}{/dev/sds}{19th SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sdaf}{32nd SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{66}{}{char }{YARC PowerPC PCI coprocessor card}
-	\minor{0}{/dev/yppcpci0}{First YARC card}
-	\minor{1}{/dev/yppcpci1}{Second YARC card}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (32-47)}
-	\minor{0}{/dev/sdag}{33rd SCSI disk whole disk}
-	\minor{16}{/dev/sdah}{34th SCSI disk whole disk}
-	\minor{32}{/dev/sdai}{35th SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sdav}{48th SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{67}{}{char }{Coda network filesystem}
-	\minor{0}{/dev/cfs0}{Coda cache manager}
-\end{devicelist}
-
-\noindent
-See {\url http://www.coda.cs.cmu.edu\/} for information about Coda.
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (48-63)}
-	\minor{0}{/dev/sdaw}{49th SCSI disk whole disk}
-	\minor{16}{/dev/sdax}{50th SCSI disk whole disk}
-	\minor{32}{/dev/sday}{51st SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sdbl}{64th SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{68}{}{char }{CAPI 2.0 interface}
-	\minor{0}{/dev/capi20}{Control device}
-	\minor{1}{/dev/capi20.00}{First CAPI 2.0 application}
-	\minor{2}{/dev/capi20.01}{Second CAPI 2.0 application}
-	\minordots
-	\minor{20}{/dev/capi20.19}{19th CAPI 2.0 application}
-\end{devicelist}
-
-\noindent
-ISDN CAPI 2.0 driver for use with CAPI 2.0 applications; currently
-supports the AVM B1 card.
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (64-79)}
-	\minor{0}{/dev/sdbm}{65th SCSI disk whole disk}
-	\minor{16}{/dev/sdbn}{66th SCSI disk whole disk}
-	\minor{32}{/dev/sdbo}{67th SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sdcb}{80th SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{69}{}{char }{MA16 numeric accelerator card}
-	\minor{0}{/dev/ma16}{Board memory access}
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (80-95)}
-	\minor{0}{/dev/sdcc}{81st SCSI disk whole disk}
-	\minor{16}{/dev/sdcd}{82nd SCSI disk whole disk}
-	\minor{32}{/dev/sdce}{83th SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sdcr}{96th SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{70}{}{char }{SpellCaster Protocol Services Interface}
-	\minor{0}{/dev/apscfg}{Configuration interface}
-	\minor{1}{/dev/apsauth}{Authentication interface}
-	\minor{2}{/dev/apslog}{Logging interface}
-	\minor{3}{/dev/apsdbg}{Debugging interface}
-	\minor{64}{/dev/apsisdn}{ISDN command interface}
-	\minor{65}{/dev/apsasync}{Async command interface}
-	\minor{128}{/dev/apsmon}{Monitor interface}
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (96-111)}
-	\minor{0}{/dev/sdcs}{97th SCSI disk whole disk}
-	\minor{16}{/dev/sdct}{98th SCSI disk whole disk}
-	\minor{32}{/dev/sdcu}{99th SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sddh}{112th SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{71}{}{char }{Computone IntelliPort II serial card}
-	\minor{0}{/dev/ttyF0}{IntelliPort II board 0, port 0}
-	\minor{1}{/dev/ttyF1}{IntelliPort II board 0, port 1}
-	\minordots
-	\minor{63}{/dev/ttyF63}{IntelliPort II board 0, port 63}
-	\minor{64}{/dev/ttyF64}{IntelliPort II board 1, port 0}
-	\minor{65}{/dev/ttyF65}{IntelliPort II board 1, port 1}
-	\minordots
-	\minor{127}{/dev/ttyF127}{IntelliPort II board 1, port 63}
-	\minor{128}{/dev/ttyF128}{IntelliPort II board 2, port 0}
-	\minor{129}{/dev/ttyF129}{IntelliPort II board 2, port 1}
-	\minordots
-	\minor{191}{/dev/ttyF191}{IntelliPort II board 2, port 63}
-	\minor{192}{/dev/ttyF192}{IntelliPort II board 3, port 0}
-	\minor{193}{/dev/ttyF193}{IntelliPort II board 3, port 1}
-	\minordots
-	\minor{255}{/dev/ttyF255}{IntelliPort II board 3, port 63}
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{SCSI disk devices (112-127)}
-	\minor{0}{/dev/sddi}{113th SCSI disk whole disk}
-	\minor{16}{/dev/sddj}{114th SCSI disk whole disk}
-	\minor{32}{/dev/sddk}{115th SCSI disk whole disk}
-	\minordots
-	\minor{240}{/dev/sddx}{128th SCSI disk whole disk}
-\end{devicelist}
-
-\noindent
-Partitions are handled in the same way as for IDE disks (see major
-number 3) except that the partition limit is 15 rather than 63 per
-disk.
-
-\begin{devicelist}
-\major{72}{}{char }{Computone IntelliPort II serial card -- alternate devices}
-	\minor{0}{/dev/cuf0}{Callout device corresponding to {\file ttyF0}}
-	\minor{1}{/dev/cuf1}{Callout device corresponding to {\file ttyF1}}
-	\minordots
-	\minor{63}{/dev/cuf63}{Callout device corresponding to {\file ttyF63}}
-	\minor{64}{/dev/cuf64}{Callout device corresponding to {\file ttyF64}}
-	\minor{65}{/dev/cuf65}{Callout device corresponding to {\file ttyF65}}
-	\minordots
-	\minor{127}{/dev/cuf127}{Callout device corresponding to {\file ttyF127}}
-	\minor{128}{/dev/cuf128}{Callout device corresponding to {\file ttyF128}}
-	\minor{129}{/dev/cuf129}{Callout device corresponding to {\file ttyF129}}
-	\minordots
-	\minor{191}{/dev/cuf191}{Callout device corresponding to {\file ttyF191}}
-	\minor{192}{/dev/cuf192}{Callout device corresponding to {\file ttyF192}}
-	\minor{193}{/dev/cuf193}{Callout device corresponding to {\file ttyF193}}
-	\minordots
-	\minor{255}{/dev/cuf255}{Callout device corresponding to {\file ttyF255}}
-\end{devicelist}
-
-\begin{devicelist}
-\major{73}{}{char }{Computone IntelliPort II serial card -- control devices}
-	\minor{0}{/dev/ip2ipl0}{Loadware device for board 0}
-	\minor{1}{/dev/ip2stat0}{Status device for board 0}
-	\minor{4}{/dev/ip2ipl1}{Loadware device for board 1}
-	\minor{5}{/dev/ip2stat1}{Status device for board 1}
-	\minor{8}{/dev/ip2ipl2}{Loadware device for board 2}
-	\minor{9}{/dev/ip2stat2}{Status device for board 2}
-	\minor{12}{/dev/ip2ipl3}{Loadware device for board 3}
-	\minor{13}{/dev/ip2stat3}{Status device for board 3}
-\end{devicelist}
-
-\begin{devicelist}
-\major{74}{}{char }{SCI bridge}
-	\minor{0}{/dev/SCI/0}{SCI device 0}
-	\minor{1}{/dev/SCI/1}{SCI device 1}
-	\minordots
-\end{devicelist}
-
-\noindent
-Currently for Dolphin Interconnect Solutions' PCI-SCI bridge.
-
-\begin{devicelist}
-\major{75}{}{char }{Specialix IO8+ serial card}
-	\minor{0}{/dev/ttyW0}{First IO8+ port, first card}
-	\minor{1}{/dev/ttyW1}{Second IO8+ port, first card}
-	\minordots
-	\minor{8}{/dev/ttyW8}{First IO8+ port, second card}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{76}{}{char }{Specialix IO8+ serial card -- alternate devices}
-	\minor{0}{/dev/cuw0}{Callout device corresponding to {\file ttyW0}}
-	\minor{1}{/dev/cuw1}{Callout device corresponding to {\file ttyW1}}
-	\minordots
-	\minor{8}{/dev/cuw8}{Callout device corresponding to {\file ttyW8}}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{77}{}{char }{ComScire Quantum Noise Generator}
-	\minor{0}{/dev/qng}{ComScire Quantum Noise Generator}
-\end{devicelist}
-
-\begin{devicelist}
-\major{78}{}{char }{PAM Software's multimodem boards}
-	\minor{0}{/dev/ttyM0}{First PAM modem}
-	\minor{1}{/dev/ttyM1}{Second PAM modem}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{79}{}{char }{PAM Software's multimodem boards -- alternate devices}
-	\minor{0}{/dev/cum0}{Callout device corresponding to {\file ttyM0}}
-	\minor{1}{/dev/cum1}{Callout device corresponding to {\file ttyM1}}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{80}{}{char }{Photometrics AT200 CCD camera}
-	\minor{0}{/dev/at200}{Photometrics AT200 CCD camera}
-\end{devicelist}
-
-\begin{devicelist}
-\major{81}{}{char }{video4linux}
-	\minor{0}{/dev/video0}{Video capture/overlay device}
-	\minordots
-	\minor{63}{/dev/video63}{Video capture/overlay device}
-	\minor{64}{/dev/radio0}{Radio device}
-	\minordots
-	\minor{127}{/dev/radio63}{Radio device}
-	\minor{192}{/dev/vtx0}{Teletext device}
-	\minordots
-	\minor{223}{/dev/vtx31}{Teletext device}
-	\minor{224}{/dev/vbi0}{Vertical blank interupt}
-	\minordots
-	\minor{255}{/dev/vbi31}{Vertical blank interupt}
-\end{devicelist}
-
-\begin{devicelist}
-\major{82}{}{char }{WiNRADiO communications receiver card}
-	\minor{0}{/dev/winradio0}{First WiNRADiO card}
-	\minor{1}{/dev/winradio1}{Second WiNRADiO card}
-	\minordots
-\end{devicelist}
-
-\noindent
-The driver and documentation may be obtained from
-{\url http://www.proximity.com.au/~brian/winradio/\/}.
-
-\begin{devicelist}
-\major{83}{}{char }{Teletext/videotext interfaces}
-        \minor{0}{/dev/vtx}{Teletext decoder}
-        \minor{16}{/dev/vttuner}{TV tuner on teletext interface}
-\end{devicelist}
-
-\noindent
-Devices for the driver contained in the VideoteXt package. More information
-on {\url http://home.pages.de/~videotext/\/}.
-
-\begin{devicelist}
-\major{84}{}{char }{Ikon 1011[57] Versatec Greensheet Interface}
-	\minor{0}{/dev/ihcp0}{First Greensheet port}
-	\minor{1}{/dev/ihcp1}{Second Greensheet port}
-\end{devicelist}
-
-\begin{devicelist}
-\major{85}{}{char }{Linux/SGI shared memory input queue}
-	\minor{0}{/dev/shmiq}{Master shared input queue}
-	\minor{1}{/dev/qcntl0}{First device pushed}
-	\minor{2}{/dev/qcntl1}{Second device pushed}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{86}{}{char }{SCSI media changer}
-	\minor{0}{/dev/sch0}{First SCSI media changer}
-	\minor{1}{/dev/sch1}{Second SCSI media changer}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{87}{}{char }{Sony Control-A1 stereo control bus}
-	\minor{0}{/dev/controla0}{First device on chain}
-	\minor{1}{/dev/controla1}{Second device on chain}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{88}{}{char }{COMX synchronous serial card}
-	\minor{0}{/dev/comx0}{Channel 0}
-	\minor{1}{/dev/comx1}{Channel 1}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{Seventh IDE hard disk/CD-ROM interface}
-        \minor{0}{/dev/hdm}{Master: whole disk (or CD-ROM)}
-        \minor{64}{/dev/hdn}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{89}{}{char }{I$^2$C bus interface}
-	\minor{0}{/dev/i2c0}{First I$^2$C adapter}
-	\minor{1}{/dev/i2c1}{Second I$^2$C adapter}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{Eighth IDE hard disk/CD-ROM interface}
-        \minor{0}{/dev/hdo}{Master: whole disk (or CD-ROM)}
-        \minor{64}{/dev/hdp}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\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{  }{}{block}{Ninth IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hdq}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdr}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{91}{}{char }{CAN-Bus controller}
-	\minor{0}{/dev/can0}{First CAN-Bus controller}
-	\minor{1}{/dev/can1}{Second CAN-Bus controller}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{  }{}{block}{Tenth IDE hard disk/CD-ROM interface}
-	\minor{0}{/dev/hds}{Master: whole disk (or CD-ROM)}
-	\minor{64}{/dev/hdt}{Slave: whole disk (or CD-ROM)}
-\end{devicelist}
-
-\noindent
-Partitions are handled the same way as for the first interface (see
-major number 3).
-
-\begin{devicelist}
-\major{92}{}{char }{Reserved for ith Kommunikationstechnik MIC ISDN card}
-\end{devicelist}
-
-\begin{devicelist}
-\major{93}{}{char }{IBM Smart Capture Card frame grabber}
-	\minor{0}{/dev/iscc0}{First Smart Capture Card}
-	\minor{1}{/dev/iscc1}{Second Smart Capture Card}
-	\minordots
-	\minor{128}{/dev/isccctl0}{First Smart Capture Card control}
-	\minor{129}{/dev/isccctl1}{Second Smart Capture Card control}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{94}{}{char }{miroVIDEO DC10/30 capture/playback device}
-	\minor{0}{/dev/dcxx0}{First capture card}
-	\minor{1}{/dev/dcxx1}{Second capture card}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{95}{}{char }{IP filter}
-	\minor{0}{/dev/ipl}{Filter control device/log file}
-	\minor{1}{/dev/ipnat}{NAT control device/log file}
-	\minor{2}{/dev/ipstate}{State information log file}
-	\minor{3}{/dev/ipauth}{Authentication control device/log file}
-\end{devicelist}
-
-\begin{devicelist}
-\major{96}{}{char }{Parallel port ATAPI tape devices}
-	\minor{0}{/dev/pt0}{First parallel port ATAPI tape}
-	\minor{1}{/dev/pt1}{Second parallel port ATAPI tape}
-	\minor{2}{/dev/pt2}{Third parallel port ATAPI tape}
-	\minor{3}{/dev/pt3}{Fourth parallel port ATAPI tape}
-	\minor{128}{/dev/npt0}{First parallel port ATAPI tape, no rewind}
-	\minor{129}{/dev/npt1}{Second parallel port ATAPI tape, no rewind}
-	\minor{130}{/dev/npt2}{Third parallel port ATAPI tape, no rewind}
-	\minor{131}{/dev/npt3}{Fourth parallel port ATAPI tape, no rewind}
-\end{devicelist}
-
-\begin{devicelist}
-\major{97}{}{char }{Parallel port generic ATAPI interface}
-	\minor{0}{/dev/pg0}{First parallel port ATAPI device}
-	\minor{1}{/dev/pg1}{Second parallel port ATAPI device}
-	\minor{2}{/dev/pg2}{Third parallel port ATAPI device}
-	\minor{3}{/dev/pg3}{Fourth parallel port ATAPI device}
-\end{devicelist}
-
-\noindent
-These devices support the same API as the generic SCSI devices.
-
-\begin{devicelist}
-\major{98}{}{char }{Control and Mesurement Device (comedi)}
-	\minor{0}{/dev/comedi0}{First comedi device}
-	\minor{1}{/dev/comedi1}{Second comedi device}
-	\minordots
-\end{devicelist}
-
-\noindent
-See {\url http://stm.lbl.gov/comedi/} or {\url
-http://www.llp.fu-berlin.de/}.
-
-\begin{devicelist}
-\major{99}{}{char }{Raw parallel ports}
-	\minor{0}{/dev/parport0}{First parallel port}
-	\minor{1}{/dev/parport1}{Second parallel port}
-	\minordots
-\end{devicelist}
-
-\noindent
-These devices can be used to drive parallel port devices from
-user-space while interacting with the parport sharing code.
-
-\begin{devicelist}
-\major{100}{}{char }{POTS (analogue telephone) A/B port}
-	\minor{0}{/dev/phone0}{First telephone port}
-	\minor{1}{/dev/phone1}{Second telephone port}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{101}{}{char }{Motorola DSP 56xxx board}
-	\minor{0}{/dev/mdspstat}{Status information}
-	\minor{1}{/dev/mdsp1}{First DSP board I/O and controls}
-	\minordots
-	\minor{16}{/dev/mdsp16}{16th DSP board I/O and controls}
-\end{devicelist}
-
-\begin{devicelist}
-\major{102}{}{char }{Philips SAA5249 Teletext signal decoder}
-	\minor{0}{/dev/tlk0}{First Teletext decoder}
-	\minor{1}{/dev/tlk1}{Second Teletext decoder}
-	\minor{2}{/dev/tlk2}{Third Teletext decoder}
-	\minor{3}{/dev/tlk3}{Fourth Teletext decoder}
-\end{devicelist}
-
-\begin{devicelist}
-\major{103}{}{char }{Arla network file system}
-	\minor{0}{/dev/xfs0}{Arla XFS}
-\end{devicelist}
-
-\noindent
-Arla is a free clone of the Andrew File System, AFS.  Any resemblance
-with the Swedish milk producer is coincidental.  For more information
-about the project, write to $<$arla-drinkers@stacken.kth.se$>$ or
-subscribe to the arla-announce mailing list by sending a mail to
-$<$arla-announce-request@stacken.kth.se$>$.
-
-\begin{devicelist}
-\major{104}{}{char }{Flash BIOS support}
-\end{devicelist}
-
-\begin{devicelist}
-\major{105}{}{char }{Comtrol VS-1000 serial card}
-	\minor{0}{/dev/ttyV0}{First VS-1000 port}
-	\minor{1}{/dev/ttyV1}{Second VS-1000 port}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{106}{}{char }{Comtrol VS-1000 serial card -- alternate devices}
-	\minor{0}{/dev/cuv0}{Callout device corresponding to {\file ttyV0}}
-	\minor{1}{/dev/cuv1}{Callout device corresponding to {\file ttyV1}}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{107}{}{char }{3Dfx Voodoo Graphics device}
-	\minor{0}{/dev/3dfx}{Primary 3Dfx graphics device}
-\end{devicelist}
-
-\begin{devicelist}
-\major{108}{}{char }{Device independent PPP interface}
-	\minor{0}{/dev/ppp}{Device independent PPP interface}
-\end{devicelist}
-
-\begin{devicelist}
-\major{109}{}{char }{Reserved for logical volume manager}
-\end{devicelist}
-
-\begin{devicelist}
-\major{110}{}{char }{miroMEDIA Surround board}
-	\minor{0}{/dev/srnd0}{First miroMEDIA Surround board}
-	\minor{1}{/dev/srnd1}{First miroMEDIA Surround board}
-	\minordots
-\end{devicelist}
-
-\begin{devicelist}
-\major{111}{--119}{}{Unallocated}
-\end{devicelist}
-
-\begin{devicelist}
-\major{120}{--127}{}{Local/experimental use}
-\end{devicelist}
-
-\begin{devicelist}
-\major{128}{--135}{char }{Unix98 PTY masters}
-\end{devicelist}
-
-\noindent
-These devices should not have corresponding device nodes; instead they
-should be accessed through the {\file /dev/ptmx} cloning device.
-
-\begin{devicelist}
-\major{136}{--143}{char }{Unix98 PTY slaves}
-	\minor{0}{/dev/pts/0}{First Unix98 pseudo-TTY}
-	\minor{1}{/dev/pts/1}{Second Unix98 pseudo-TTY}
-	\minordots
-\end{devicelist}
-
-\noindent
-These device nodes are automatically generated with the proper
-permissions and modes by mounting the {\file devpts} filesystem onto
-{\file /dev/pts} with the appropriate mount options (distribution
-dependent.)
-
-\begin{devicelist}
-\major{144}{--239}{}{Unallocated}
-\end{devicelist}
-
-\begin{devicelist}
-\major{240}{--254}{}{Local/experimental use}
-\end{devicelist}
-
-\begin{devicelist}
-\major{255}{}{}{Reserved}
-\end{devicelist}
-
-\noindent
-This major is reserved to assist the expansion to a larger number
-space.  No device nodes with this major should ever be created on any
-filesystem.
-
-\section{Additional /dev directory entries}
-
-This section details additional entries that should or may exist in the
-{\file /dev} directory.  It is preferred that symbolic links use the
-same form (absolute or relative) as is indicated here.  Links are
-classified as {\em hard\/} or {\em symbolic\/} depending on the
-preferred type of link; if possible, the indicated type of link should
-be used.
-
-\subsection{Compulsory links}
-
-These links should exist on all systems:
-
-\begin{nodelist}
-\link{/dev/fd}{/proc/self/fd}{symbolic}{File descriptors}
-\link{/dev/stdin}{fd/0}{symbolic}{Standard input file descriptor}
-\link{/dev/stdout}{fd/1}{symbolic}{Standard output file descriptor}
-\link{/dev/stderr}{fd/2}{symbolic}{Standard error file descriptor}
-\link{/dev/nfsd}{socksys}{symbolic}{Required by iBCS-2}
-\link{/dev/X0R}{null}{symbolic}{Required by iBCS-2}
-\end{nodelist}
-
-\noindent
-Note: The last device is: $<$letter {\tt X}$>$-$<$digit {\tt
-0}$>$-$<$letter {\tt R}$>$.
-
-\subsection{Recommended links}
-
-It is recommended that these links exist on all systems:
-
-\begin{nodelist}
-\link{/dev/core}{/proc/kcore}{symbolic}{Backward compatibility}
-\link{/dev/ramdisk}{ram0}{symbolic}{Backward compatibility}
-\link{/dev/ftape}{qft0}{symbolic}{Backward compatibility}
-\link{/dev/bttv0}{video0}{symbolic}{Backward compatibility}
-\link{/dev/radio}{radio0}{symbolic}{Backward compatibility}
-\link{/dev/scd?}{sr?}{hard}{Alternate name for CD-ROMs}
-\end{nodelist}
-
-\subsection{Locally defined links}
-
-The following links may be established locally to conform to the
-configuration of the system.  This is merely a tabulation of existing
-practice, and does not constitute a recommendation.  However, if they
-exist, they should have the following uses.
-
-\begin{nodelist}
-\vlink{/dev/mouse}{mouse port}{symbolic}{Current mouse device}
-\vlink{/dev/tape}{tape device}{symbolic}{Current tape device}
-\vlink{/dev/cdrom}{CD-ROM device}{symbolic}{Current CD-ROM device}
-\vlink{/dev/cdwriter}{CD-writer}{symbolic}{Current CD-writer device}
-\vlink{/dev/scanner}{scanner device}{symbolic}{Current scanner device}
-\vlink{/dev/modem}{modem port}{symbolic}{Current dialout device}
-\vlink{/dev/root}{root device}{symbolic}{Current root filesystem}
-\vlink{/dev/swap}{swap device}{symbolic}{Current swap device}
-\end{nodelist}
-
-\noindent
-{\file /dev/modem} should not be used for a modem which supports
-dialin as well as dialout, as it tends to cause lock file problems.
-If it exists, {\file /dev/modem} should point to the appropriate
-primary TTY device (the use of the alternate callout devices is
-deprecated.)
-
-For SCSI devices, {\file /dev/tape} and {\file /dev/cdrom} should
-point to the ``cooked'' devices ({\file /dev/st*} and {\file
-/dev/sr*}, respectively), whereas {\file /dev/cdwriter} and {\file
-/dev/scanner} should point to the appropriate generic SCSI devices
-({\file /dev/sg*}).
-
-{\file /dev/mouse} may point to a primary serial TTY device, a
-hardware mouse device, or a socket for a mouse driver program
-(e.g. {\file /dev/gpmdata}).
-
-\subsection{Sockets and pipes}
-
-Non-transient sockets or named pipes may exist in {\file /dev}.
-Common entries are:
-
-\begin{nodelist}
-\node{/dev/printer}{socket}{{\file lpd} local socket}
-\node{/dev/log}{socket}{{\file syslog} local socket}
-\node{/dev/gpmdata}{socket}{{\file gpm} mouse multiplexer}
-\end{nodelist}
-
-\section{Terminal devices}
-
-Terminal, or TTY devices are a special class of character devices.  A
-terminal device is any device that could act as a controlling terminal
-for a session; this includes virtual consoles, serial ports, and
-pseudoterminals (PTYs).
-
-All terminal devices share a common set of capabilities known as line
-diciplines; these include the common terminal line dicipline as well
-as SLIP and PPP modes.
-
-All terminal devices are named similarly; this section explains the
-naming and use of the various types of TTYs.  Note that the naming
-conventions include several historical warts; some of these are
-Linux-specific, some were inherited from other systems, and some
-reflect Linux outgrowing a borrowed convention.
-
-A hash mark ($\#$) in a device name is in all cases used here to
-indicate a decimal number without leading zeroes.
-
-\subsection{Virtual consoles and the console device}
-
-Virtual consoles are full-screen terminal displays on the system video
-monitor.  Virtual consoles are named {\file /dev/tty$\#$}, with
-numbering starting at {\file /dev/tty1}; {\file /dev/tty0} is the
-current virtual console.  {\file /dev/tty0} is the device that should
-be used to access the system video card on those architectures for
-which the frame buffer devices ({\file /dev/fb*}) are not applicable.
-Do not use {\file /dev/console} for this purpose.
-
-The {\em console device\/}, {\file /dev/console}, is the device to
-which system messages should be sent, and on which logins should be
-permitted in single-user mode.  Starting with Linux 2.1.71, {\file
-/dev/console} is managed by the kernel; for previous versions it
-should be a symbolic link to either {\file /dev/tty0}, a specific
-virtual console such as {\file /dev/tty1}, or to a serial port primary
-({\file tty*}, not {\file cu*}) device, depending on the configuration
-of the system.
-
-\subsection{Serial ports}
-
-Serial ports are RS-232 serial ports and any device which simulates
-one, either in hardware (such as internal modems) or in software (such
-as the ISDN driver.)  Under Linux, each serial ports has two device
-names, the primary or callin device and the alternate or callout one.
-Each kind of device is indicated by a different letter.  For any
-letter $X$, the names of the devices are {\file /dev/tty${X\#}$} and
-{\file /dev/cu${x\#}$}, respectively; for historical reasons, {\file
-/dev/ttyS$\#$} and {\file /dev/ttyC$\#$} correspond to {\file
-/dev/cua$\#$} and {\file /dev/cub$\#$}.  In the future, it should be
-expected that multiple letters will be used; all letters will be upper
-case for the {\file tty} device (e.g. {\file /dev/ttyDP$\#$} and lower
-case for the {\file cu} device (e.g. {\file /dev/cudp$\#$}.
-
-The use of the callout devices is deprecated.
-
-The names {\file /dev/ttyQ$\#$} and {\file /dev/cuq$\#$} are reserved
-for local use.
-
-The alternate devices provide for kernel-based exclusion and somewhat
-different defaults than the primary devices.  Their main purpose is to
-allow the use of serial ports with programs with no inherent or broken
-support for serial ports.  Their use is deprecated, and they may be
-removed from a future version of Linux.
-
-Arbitration of serial ports is provided by the use of lock files with
-the names {\file /var/lock/LCK..tty${X\#}$}.  The contents of the lock
-file should be the PID of the locking process as an ASCII number.
-
-It is common practice to install links such as {\file /dev/modem\/}
-which point to serial ports.  In order to ensure proper locking in the
-presence of these links, it is recommended that software chase
-symlinks and lock all possible names; additionally, it is recommended
-that a lock file be installed with the corresponding alternate
-device.  In order to avoid deadlocks, it is recommended that the locks
-are acquired in the following order, and released in the reverse:
-\begin{itemize}
-\item{The symbolic link name, if any ({\file /var/lock/LCK..modem})}
-\item{The {\file tty} name ({\file /var/lock/LCK..ttyS2})}
-\item{The alternate device name ({\file /var/lock/LCK..cua2})}
-\end{itemize}
-In the case of nested symbolic links, the lock files should be
-installed in the order the symlinks are resolved.
-
-Under no circumstances should an application hold a lock while waiting
-for another to be released.  In addition, applications which attempt
-to create lock files for the corresponding alternate device names
-should take into account the possibility of being used on a non-serial
-port TTY, for which no alternate device would exist.
-
-\subsection{Pseudoterminals (PTYs)}
-
-Pseudoterminals, or PTYs, are used to create login sessions or provide
-other capabilities requiring a TTY line dicipline (including SLIP or
-PPP capability) to arbitrary data-generation processes.  Each PTY has
-a {\em master\/} side, named {\file /dev/pty[p-za-e][0-9a-f]\/}, and a
-{\em slave\/} side, named {\file /dev/tty[p-za-e][0-9a-f]\/}.  The
-kernel arbitrates the use of PTYs by allowing each master side to be
-opened only once.
-
-Once the master side has been opened, the corresponding slave device
-can be used in the same manner as any TTY device.  The master and
-slave devices are connected by the kernel, generating the equivalent
-of a bidirectional pipe with TTY capabilities.
-
-Recent versions of the Linux kernels and GNU libc contain support for
-the System V/Unix98 naming scheme for PTYs, which assigns a common
-device {\file /dev/ptmx\/} to all the masters (opening it will
-automatically give you a previously unassigned PTY) and a subdirectory
-{\file /dev/pts\/} for the slaves; the slaves are named with decimal
-integers ({\file /dev/pts/$\#$\/} in our notation).  This removes the
-problem of exhausting the namespace and enables the kernel to
-automatically create the device nodes for the slaves on demand using
-the {\file devpts\/} filesystem.
-
-\end{document}
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index c17b77188..6332b478e 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: December 16, 1999
+		     Last revised: March 23, 2000
 
 This list is the Linux Device List, the official registry of allocated
 device numbers and /dev directory nodes for the Linux operating
@@ -14,12 +14,15 @@ ftp://ftp.kernel.org/pub/linux/docs/device-list/.  The LaTeX version
 of this document is no longer maintained.
 
 This document is included by reference into the Filesystem Hierarchy
-Standard (FHS).  The FHS is available from http://www.pathname.com/fhs/.
+Standard (FHS).	 The FHS is available from http://www.pathname.com/fhs/.
 
 Allocations marked (68k/Amiga) apply to Linux/68k on the Amiga
 platform only.	Allocations marked (68k/Atari) apply to Linux/68k on
 the Atari platform only.
 
+The symbol {2.6} means the allocation is obsolete and scheduled for
+removal once kernel version 2.6 (or equivalent) is released.
+
 This document is in the public domain.	The author requests, however,
 that semantically altered versions are not distributed without
 permission of the author, assuming the author can be contacted without
@@ -198,7 +201,7 @@ Your cooperation is appreciated.
 
 		Older versions of the Linux kernel used this major
 		number for BSD PTY devices.  As of Linux 2.1.115, this
-		is no longer supported.  Use major numbers 2 and 3.
+		is no longer supported.	 Use major numbers 2 and 3.
 
   5 char	Alternate TTY devices
 		  0 = /dev/tty		Current TTY device
@@ -304,8 +307,11 @@ Your cooperation is appreciated.
 		  7 = /dev/amigamouse1	Second Amiga mouse
 		  8 = /dev/smouse	Simple serial mouse driver
 		  9 = /dev/pc110pad	IBM PC-110 digitizer pad
+		 10 = /dev/adbmouse	Apple Desktop Bus mouse
+		 11 = /dev/vrtpanel	Vr41xx embedded touch panel
+		 13 = /dev/vpcmouse	Connectix Virtual PC Mouse
 		128 = /dev/beep		Fancy beep device
-		129 = /dev/modreq	Kernel module load request
+		129 = /dev/modreq	Kernel module load request {2.6}
 		130 = /dev/watchdog	Watchdog timer port
 		131 = /dev/temperature	Machine internal temperature
 		132 = /dev/hwtrap	Hardware fault trap
@@ -318,7 +324,7 @@ Your cooperation is appreciated.
 		142 = /dev/msr		x86 model-specific registers
 		143 = /dev/pciconf	PCI configuration space
 		144 = /dev/nvram	Non-volatile configuration RAM
-		145 = /dev/hfmodem	Soundcard shortwave modem control
+		145 = /dev/hfmodem	Soundcard shortwave modem control {2.6}
 		146 = /dev/graphics	Linux/SGI graphics device
 		147 = /dev/opengl	Linux/SGI OpenGL pipe
 		148 = /dev/gfx		Linux/SGI graphics effects device
@@ -352,6 +358,11 @@ Your cooperation is appreciated.
 		177 = /dev/cbm		Serial CBM bus
 		178 = /dev/jsflash	JavaStation OS flash SIMM
 		179 = /dev/xsvc		High-speed shared-mem/semaphore service
+		180 = /dev/vrbuttons	Vr41xx button input device
+		181 = /dev/toshiba	Toshiba laptop SMM support
+		182 = /dev/perfctr	Performance-monitoring counters
+		183 = /dev/intel_rng	Intel i8x0 random number generator
+		184 = /dev/cpu/microcode CPU microcode update interface
 		240-255			Reserved for local use
 
  11 char	Raw keyboard device
@@ -380,7 +391,7 @@ Your cooperation is appreciated.
 		The device names specified are proposed -- if there
 		are "standard" names for these devices, please let me know.
 
-    block	MSCDEX CD-ROM callback support
+    block	MSCDEX CD-ROM callback support {2.6}
 		  0 = /dev/dos_cd0	First MSCDEX CD-ROM
 		  1 = /dev/dos_cd1	Second MSCDEX CD-ROM
 		    ...
@@ -407,7 +418,7 @@ Your cooperation is appreciated.
 		  2 = /dev/midi00	First MIDI port
 		  3 = /dev/dsp		Digital audio
 		  4 = /dev/audio	Sun-compatible digital audio
-		  6 = /dev/sndstat	Sound card status information
+		  6 = /dev/sndstat	Sound card status information {2.6}
 		  7 = /dev/audioctl	SPARC audio control device
 		  8 = /dev/sequencer2	Sequencer -- alternate device
 		 16 = /dev/mixer1	Second soundcard mixer control
@@ -418,7 +429,7 @@ Your cooperation is appreciated.
 		 33 = /dev/patmgr1	Sequencer patch manager
 		 34 = /dev/midi02	Third MIDI port
 		 50 = /dev/midi03	Fourth MIDI port
-    block	BIOS harddrive callback support
+    block	BIOS harddrive callback support {2.6}
 		  0 = /dev/dos_hda	First BIOS harddrive whole disk
 		 64 = /dev/dos_hdb	Second BIOS harddrive whole disk
 		128 = /dev/dos_hdc	Third BIOS harddrive whole disk
@@ -549,7 +560,7 @@ Your cooperation is appreciated.
 		  2 = /dev/sbpcd2	Panasonic CD-ROM controller 0 unit 2
 		  3 = /dev/sbpcd3	Panasonic CD-ROM controller 0 unit 3
 
- 26 char	Quanta WinVision frame grabber
+ 26 char	Quanta WinVision frame grabber {2.6}
 		  0 = /dev/wvisfgrab	Quanta WinVision frame grabber
     block	Second Matsushita (Panasonic/SoundBlaster) CD-ROM
 		  0 = /dev/sbpcd4	Panasonic CD-ROM controller 1 unit 0
@@ -569,7 +580,7 @@ Your cooperation is appreciated.
 		 16 = /dev/zqft0	Unit 0, rewind-on-close, compression
 		 17 = /dev/zqft1	Unit 1, rewind-on-close, compression
 		 18 = /dev/zqft2	Unit 2, rewind-on-close, compression
-		 19 = /dev/zqtf3	Unit 3, rewind-on-close, compression
+		 19 = /dev/zqft3	Unit 3, rewind-on-close, compression
 		 20 = /dev/nzqft0	Unit 0, no rewind-on-close, compression
 		 21 = /dev/nzqft1	Unit 1, no rewind-on-close, compression
 		 22 = /dev/nzqft2	Unit 2, no rewind-on-close, compression
@@ -613,12 +624,11 @@ Your cooperation is appreciated.
 		disks (see major number 3) except that the limit on
 		partitions is 15, like SCSI.
 
- 29 char	Universal frame buffers
+ 29 char	Universal frame buffer
 		  0 = /dev/fb0		First frame buffer
-		  1 = /dev/fb1		Second frame buffer
-		  2 = /dev/fb2		Third frame buffer
+		 32 = /dev/fb1		Second frame buffer
 		    ...
-		 31 = /dev/fb31		32nd frame buffer
+		224 = /dev/fb7		Eighth frame buffer
 
 		All additional minor numbers are reserved.
 
@@ -777,7 +787,7 @@ Your cooperation is appreciated.
 		      ...
     block	Reserved for Linux/AP+
 
- 40 char	Matrox Meteor frame grabber
+ 40 char	Matrox Meteor frame grabber {2.6}
 		  0 = /dev/mmetfgrab	Matrox Meteor frame grabber
     block	Syquest EZ135 parallel port removable drive
 		  0 = /dev/eza		Parallel EZ135 drive, whole disk
@@ -1265,7 +1275,7 @@ Your cooperation is appreciated.
 		disks (see major number 3) except that the limit on
 		partitions is 15.
 
- 83 char	Teletext/videotext interfaces
+ 83 char	Teletext/videotext interfaces {2.6}
 		  0 = /dev/vtx		Teletext decoder
 		 16 = /dev/vttuner	TV tuner on teletext interface
 
@@ -1356,8 +1366,8 @@ Your cooperation is appreciated.
 
 
  89 char	I2C bus interface
-		  0 = /dev/i2c0		First I2C adapter
-		  1 = /dev/i2c1		Second I2C adapter
+		  0 = /dev/i2c-0	First I2C adapter
+		  1 = /dev/i2c-1	Second I2C adapter
 		    ...
 
     block	Eighth IDE hard disk/CD-ROM interface
@@ -1404,7 +1414,7 @@ Your cooperation is appreciated.
 		disks (see major number 3) except that the limit on
 		partitions is 15.
 
- 93 char	IBM Smart Capture Card frame grabber
+ 93 char	IBM Smart Capture Card frame grabber {2.6}
 		  0 = /dev/iscc0	First Smart Capture Card
 		  1 = /dev/iscc1	Second Smart Capture Card
 		    ...
@@ -1418,7 +1428,7 @@ Your cooperation is appreciated.
 		    ...
 		240 = /dev/nftlp	16th NTFL layer
 
- 94 char	miroVIDEO DC10/30 capture/playback device
+ 94 char	miroVIDEO DC10/30 capture/playback device {2.6}
 		  0 = /dev/dcxx0	First capture card
 		  1 = /dev/dcxx1	Second capture card
 		    ...
@@ -1462,6 +1472,11 @@ Your cooperation is appreciated.
 		These devices support the same API as the generic SCSI
 		devices.
 
+    block	Packet writing for CD/DVD devices
+		  0 = /dev/pktcdvd0	First packet-writing module
+		  1 = /dev/pktcdvd1	Second packet-writing module
+		    ...
+
  98 char	Control and Measurement Device (comedi)
 		  0 = /dev/comedi0	First comedi device
 		  1 = /dev/comedi1	Second comedi device
@@ -1469,23 +1484,34 @@ Your cooperation is appreciated.
 
 		See http://stm.lbl.gov/comedi or http://www.llp.fu-berlin.de/.
 
+    block	User-mode virtual block device
+		  0 = /dev/ubd0		First user-mode block device
+		  1 = /dev/ubd1		Second user-mode block device
+		    ...
+
+		This device is used by the user-mode virtual kernel port.
+
  99 char	Raw parallel ports
 		  0 = /dev/parport0	First parallel port
 		  1 = /dev/parport1	Second parallel port
 		    ...
 
-100 char	POTS (analogue telephone) A/B port
+100 char	POTS (analogue telephone) A/B port {2.6}
 		  0 = /dev/phone0	First telephone port
 		  1 = /dev/phone1	Second telephone port
 		    ...
 
+		The names have been reallocated to Telephony For
+		Linux, major 159.  All use of major 100 should be
+		considered legacy and deprecated.
+
 101 char	Motorola DSP 56xxx board
 		  0 = /dev/mdspstat	Status information
 		  1 = /dev/mdsp1	First DSP board I/O controls
 		    ...
 		 16 = /dev/mdsp16	16th DSP board I/O controls
 
-102 char	Philips SAA5249 Teletext signal decoder
+102 char	Philips SAA5249 Teletext signal decoder {2.6}
 		  0 = /dev/tlk0		First Teletext decoder
 		  1 = /dev/tlk1		Second Teletext decoder
 		  2 = /dev/tlk2		Third Teletext decoder
@@ -1526,7 +1552,7 @@ Your cooperation is appreciated.
 		  1 = /dev/srnd1	Second miroMEDIA Surround board
 		    ...
 
-111 char	Philips SAA7146-based audio/video card
+111 char	Philips SAA7146-based audio/video card {2.6}
 		  0 = /dev/av0		First A/V card
 		  1 = /dev/av1		Second A/V card
 		    ...
@@ -1562,7 +1588,7 @@ Your cooperation is appreciated.
 
 		Plays music using IBM BASIC style strings.
 
-116 char	Advanced Linux System Driver (ALSA)
+116 char	Advanced Linux Sound Driver (ALSA)
 
 117 char	COSA/SRP synchronous serial card
 		  0 = /dev/cosa0c0	1st board, 1st channel
@@ -1691,9 +1717,9 @@ Your cooperation is appreciated.
 		  1 = /dev/gfax1	GammaLink channel 1
 		    ...
 
-159 char	Quicknet Technologies Internet PhoneJack/LineJack
-		  0 = /dev/ixj0		First device
-		  1 = /dev/ixj1		Second device
+159 char	Telephony for Linux
+		  0 = /dev/phone0	First telephony device
+		  1 = /dev/phone1	Second telephony device
 		    ...
 
 160 char	General Purpose Instrument Bus (GPIB)
@@ -1735,9 +1761,9 @@ Your cooperation is appreciated.
 		 63 = /dev/ttyCH63	AT/PCI-Fast board 3, port 15
 
 165 char	Chase Research AT/PCI-Fast serial card - alternate devices
-		  0 = /dev/cuch0	Callout device corresponding to ttyCH0
+		  0 = /dev/cuch0	Callout device for ttyCH0
 		    ...
-		 63 = /dev/cuch63	Callout device corresponding to ttyCH63
+		 63 = /dev/cuch63	Callout device for ttyCH63
 
 166 char	ACM USB modems
 		  0 = /dev/ttyACM0	First ACM modem
@@ -1796,13 +1822,13 @@ Your cooperation is appreciated.
 		    ...
 
 177 char	TI PCILynx memory spaces
-		  0 = /dev/pcilynx/aux0  AUX space of first PCILynx card
+		  0 = /dev/pcilynx/aux0	 AUX space of first PCILynx card
 		    ...
 		 15 = /dev/pcilynx/aux15 AUX space of 16th PCILynx card
-		 16 = /dev/pcilynx/rom0  ROM space of first PCILynx card
+		 16 = /dev/pcilynx/rom0	 ROM space of first PCILynx card
 		    ...
 		 31 = /dev/pcilynx/rom15 ROM space of 16th PCILynx card
-		 32 = /dev/pcilynx/ram0  RAM space of first PCILynx card
+		 32 = /dev/pcilynx/ram0	 RAM space of first PCILynx card
 		    ...
 		 47 = /dev/pcilynx/ram15 RAM space of 16th PCILynx card
 
@@ -1829,6 +1855,7 @@ Your cooperation is appreciated.
 		 48 = /dev/usb/scanner0	First USB scanner
 		    ...
 		 63 = /dev/usb/scanner15 16th USB scanner
+		 64 = /dev/usb/rio500	Diamond Rio 500
 
 181 char	Conrad Electronic parallel port radio clocks
 		  0 = /dev/pcfclock0	First Conrad radio clock
@@ -1836,7 +1863,7 @@ Your cooperation is appreciated.
 		    ...
 
 182 char	Picture Elements THR2 binarizer
-		  0 = /dev/pethr0       First THR2 board
+		  0 = /dev/pethr0	First THR2 board
 		  1 = /dev/pethr1	Second THR2 board
 		    ...
 
@@ -1853,7 +1880,12 @@ Your cooperation is appreciated.
 		  1 = /dev/pevss1	Second sender board
 		    ...
 
-185 char	Reserved for InterMezzo high availability file system
+185 char	InterMezzo high availability file system
+		  0 = /dev/intermezzo0	First cache manager
+		  1 = /dev/intermezzo1	Second cache manager
+		    ...
+
+		See http://www.inter-mezzo.org/ for more information.
 
 186 char	Object-based storage control device
 		  0 = /dev/obd0		First obd control device
@@ -1862,7 +1894,10 @@ Your cooperation is appreciated.
 
 		See ftp://ftp.lustre.org/pub/obd for code and information.
 
-187 char	UNALLOCATED
+187 char	DESkey hardware encryption device
+		  0 = /dev/deskey0	First DES key
+		  1 = /dev/deskey1	Second DES key
+		    ...
 
 188 char	USB serial converters
 		  0 = /dev/ttyUSB0	First USB serial converter
@@ -1870,11 +1905,46 @@ Your cooperation is appreciated.
 		    ...
 
 189 char	USB serial converters - alternate devices
-		  0 = /dev/cuusb0	Callout device corresponding to ttyUSB0
-		  1 = /dev/cuusb1	Callout device corresponding to ttyUSB1
+		  0 = /dev/cuusb0	Callout device for ttyUSB0
+		  1 = /dev/cuusb1	Callout device for ttyUSB1
 		    ...
 
-190-239		UNALLOCATED
+190 char	Kansas City tracker/tuner card
+		  0 = /dev/kctt0	First KCT/T card
+		  1 = /dev/kctt1	Second KCT/T card
+		    ...
+
+191 char	Reserved for PCMCIA
+
+192 char	Kernel profiling interface
+		  0 = /dev/profile	Profiling control device
+		  1 = /dev/profile0	Profiling device for CPU 0
+		  2 = /dev/profile1	Profiling device for CPU 1
+		    ...
+
+193 char	Kernel event-tracing interface
+		  0 = /dev/trace	Tracing control device
+		  1 = /dev/trace0	Tracing device for CPU 0
+		  2 = /dev/trace1	Tracing device for CPU 1
+		    ...
+
+194 char	linVideoStreams (LINVS)
+		  0 = /dev/mvideo/status0	Video compression status
+		  1 = /dev/mvideo/stream0	Video stream
+		  2 = /dev/mvideo/frame0	Single compressed frame
+		  3 = /dev/mvideo/rawframe0	Raw uncompressed frame
+		  4 = /dev/mvideo/codec0	Direct codec access
+		  5 = /dev/mvideo/video4linux0	Video4Linux compatibility
+
+		 16 = /dev/mvideo/status1	Second device
+		    ...
+		 32 = /dev/mvideo/status2	Third device
+		    ...
+		    ...
+		240 = /dev/mvideo/status15	16th device 
+		    ...
+
+195-239		UNALLOCATED
 
 240-254		LOCAL/EXPERIMENTAL USE
 
@@ -1903,7 +1973,6 @@ These links should exist on all systems:
 /dev/stderr	fd/2		symbolic	stderr file descriptor
 /dev/nfsd	socksys		symbolic	Required by iBCS-2
 /dev/X0R	null		symbolic	Required by iBCS-2
-/dev/i2o*	/dev/i2o/*	symbolic	Backward compatibility
 
 Note: /dev/X0R is <letter X>-<digit 0>-<letter R>.
 
@@ -1916,6 +1985,7 @@ It is recommended that these links exist on all systems:
 /dev/ftape	qft0		symbolic	Backward compatibility
 /dev/bttv0	video0		symbolic	Backward compatibility
 /dev/radio	radio0		symbolic	Backward compatibility
+/dev/i2o*	/dev/i2o/*	symbolic	Backward compatibility
 /dev/scd?	sr?		hard		Alternate SCSI CD-ROM name
 
 	Locally defined links
@@ -1983,7 +2053,7 @@ monitor.  Virtual consoles are named /dev/tty#, with numbering
 starting at /dev/tty1; /dev/tty0 is the current virtual console.
 /dev/tty0 is the device that should be used to access the system video
 card on those architectures for which the frame buffer devices
-(/dev/fb*) are not applicable.  Do not use /dev/console
+(/dev/fb*) are not applicable.	Do not use /dev/console
 for this purpose.
 
 The console device, /dev/console, is the device to which system
@@ -2000,10 +2070,10 @@ Serial ports are RS-232 serial ports and any device which simulates
 one, either in hardware (such as internal modems) or in software (such
 as the ISDN driver.)  Under Linux, each serial ports has two device
 names, the primary or callin device and the alternate or callout one.
-Each kind of device is indicated by a different letter.  For any
+Each kind of device is indicated by a different letter.	 For any
 letter X, the names of the devices are /dev/ttyX# and /dev/cux#,
 respectively; for historical reasons, /dev/ttyS# and /dev/ttyC#
-correspond to /dev/cua# and /dev/cub#.  In the future, it should be
+correspond to /dev/cua# and /dev/cub#.	In the future, it should be
 expected that multiple letters will be used; all letters will be upper
 case for the "tty" device (e.g. /dev/ttyDP#) and lower case for the
 "cu" device (e.g. /dev/cudp#).
@@ -2017,7 +2087,7 @@ support for serial ports.  Their use is deprecated, and they may be
 removed from a future version of Linux.
 
 Arbitration of serial ports is provided by the use of lock files with
-the names /var/lock/LCK..ttyX#.  The contents of the lock file should
+the names /var/lock/LCK..ttyX#.	 The contents of the lock file should
 be the PID of the locking process as an ASCII number.
 
 It is common practice to install links such as /dev/modem
@@ -2025,7 +2095,7 @@ which point to serial ports.  In order to ensure proper locking in the
 presence of these links, it is recommended that software chase
 symlinks and lock all possible names; additionally, it is recommended
 that a lock file be installed with the corresponding alternate
-device.  In order to avoid deadlocks, it is recommended that the locks
+device.	 In order to avoid deadlocks, it is recommended that the locks
 are acquired in the following order, and released in the reverse:
 
 	1. The symbolic link name, if any (/var/lock/LCK..modem)
@@ -2045,7 +2115,7 @@ port TTY, for which no alternate device would exist.
 
 Pseudoterminals, or PTYs, are used to create login sessions or provide
 other capabilities requiring a TTY line dicipline (including SLIP or
-PPP capability) to arbitrary data-generation processes.  Each PTY has
+PPP capability) to arbitrary data-generation processes.	 Each PTY has
 a master side, named /dev/pty[p-za-e][0-9a-f], and a slave side, named
 /dev/tty[p-za-e][0-9a-f].  The kernel arbitrates the use of PTYs by
 allowing each master side to be opened only once.
diff --git a/Documentation/isapnp.txt b/Documentation/isapnp.txt
index 4054ecf2f..4cb7a9b59 100644
--- a/Documentation/isapnp.txt
+++ b/Documentation/isapnp.txt
@@ -64,10 +64,10 @@ extern struct pci_bus *isapnp_find_card(unsigned short vendor,
                                         unsigned short device,
                                         struct pci_bus *from);
 
-The above function finds a ISA PnP card. For the vendor device should
+This function finds a ISA PnP card. For the vendor device should
 be used ISAPNP_VENDOR(a,b,c) where a,b,c are characters or integers.
 For the device number should be used ISAPNP_DEVICE(x) macro where x is
-integer value. Both vendor and device numbers can be get from contents
+integer value. Both vendor and device numbers can be taken from contents
 of the /proc/isapnp file.
 
 extern struct pci_dev *isapnp_find_dev(struct pci_bus *card,
@@ -75,12 +75,37 @@ extern struct pci_dev *isapnp_find_dev(struct pci_bus *card,
                                        unsigned short function,
                                        struct pci_dev *from);
 
-The above function finds the ISA PnP device. If card is NULL, then
+This function finds the ISA PnP device. If card is NULL, then
 the global search mode is used (all devices are used for the searching).
 Otherwise only devices which belongs to the specified card are verified.
 For the function number can be used ISAPNP_FUNCTION(x) macro which works
 similarly as the ISAPNP_DEVICE(x) macro.
 
+extern int isapnp_probe_cards(const struct isapnp_card_id *ids,
+			      int (*probe)(struct pci_bus *card,
+					   const struct isapnp_card_id *id));
+
+
+This function is a helper for drivers which requires to use more than
+one device from an ISA PnP card. For each cards is called the probe
+callback with appropriate information.
+
+Example for ids parameter initialization:
+
+static struct isapnp_card_id ids[] __devinitdata = {
+	{
+        	ISAPNP_CARD_ID('A','D','V', 0x550a),
+                devs: {
+			ISAPNP_DEVICE_ID('A', 'D', 'V', 0x0010),
+			ISAPNP_DEVICE_ID('A', 'D', 'V', 0x0011)
+		},
+		driver_data: 0x1234,
+	},
+	{
+		ISAPNP_CARD_END,
+	}
+};
+
 ISA PnP configuration
 =====================
 
@@ -99,19 +124,25 @@ otherwise the access to the ISA PnP configuration functions will be blocked.
 Second way is auto-configuration
 --------------------------------
 
-These two functions gives to the driver the real power of the ISA PnP
-feature. First function dev->prepare() only initialize the resource
-members in the device structure. This structure contains all resources
-set to auto configuration values after the initialization. The driver for
-ISA PnP device may modify (or not) some resources to skip auto configuration
-for the given resource.
+This feature gives to the driver the real power of the ISA PnP code.
+Function dev->prepare() initializes the resource members in the device
+structure. This structure contains all resources set to auto configuration
+values after the initialization. The device driver may modify some resources
+to skip the auto configuration for a given resource.
 
-The function isapnp_configure does:
-	- resources which have the auto configuration value are configured
+Once the device structure contains all requested resource values, the function
+dev->activate() must be called to assign free resources to resource members
+with the auto configuration value.
+
+Function dev->activate() does:
+	- resources with the auto configuration value are configured
 	- the auto configuration is created using ISA PnP resource map
 	- the function writes configuration to ISA PnP configuration registers
 	- the function returns to the caller actual used resources
 
+When the device driver is removing, function dev->deactivate() has to be
+called to free all assigned resources.
+
 Example (game port initialization)
 ==================================
 
diff --git a/Documentation/isdn/README.eicon b/Documentation/isdn/README.eicon
index 73d8c92dd..87b40c6dd 100644
--- a/Documentation/isdn/README.eicon
+++ b/Documentation/isdn/README.eicon
@@ -1,4 +1,4 @@
-$Id: README.eicon,v 1.6 2000/01/27 09:54:44 armin Exp $
+$Id: README.eicon,v 1.7 2000/03/06 16:38:43 armin Exp $
 
 (c) 1999,2000 Armin Schindler (mac@melware.de)
 (c) 1999,2000 Cytronics & Melware (info@melware.de)
@@ -78,6 +78,10 @@ Example for loading and starting a BRI card with E-DSS1 Protocol.
 
 	eiconctrl [-d DriverId] load etsi
 
+Example for a BRI card with E-DSS1 Protocol with PtP configuration.
+
+	eiconctrl [-d DriverId] load etsi -n -t0 -s1
+
 
 Example for loading and starting a PRI card with E-DSS1 Protocol.
 
diff --git a/Documentation/networking/tlan.txt b/Documentation/networking/tlan.txt
index 4e1347395..1485930fb 100644
--- a/Documentation/networking/tlan.txt
+++ b/Documentation/networking/tlan.txt
@@ -1,8 +1,8 @@
 (C) 1997-1998 Caldera, Inc.
 (C) 1998 James Banks
-(C) 1999-2000 Torben Mathiasen <torben.mathiasen@compaq.com>
+(C) 1999-2000 Torben Mathiasen <tmm@image.dk, torben.mathiasen@compaq.com>
 
-TLAN driver for Linux, version 1.3
+TLAN driver for Linux, version 1.5
 README
 
 
diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt
index ecef178b0..f4b553705 100644
--- a/Documentation/networking/tulip.txt
+++ b/Documentation/networking/tulip.txt
@@ -125,7 +125,7 @@ them.  The MII transceiver status is polled using an kernel timer.
 
 
 Source tree tour
-----------------
+================
 The following is a list of files comprising the Tulip ethernet driver in
 drivers/net/tulip subdirectory.
 
@@ -140,5 +140,24 @@ tulip_core.c	- Driver core (a.k.a. where "everything else" goes)
 
 
 
+Version history
+===============
+0.9.4.2 (March 21, 2000):
+* Fix 21041 CSR7, CSR13/14/15 handling
+* Merge some PCI ids from tulip 0.91x
+* Merge some HAS_xxx flags and flag settings from tulip 0.91x
+* asm/io.h fix (submitted by many) and cleanup
+* s/HAS_NWAY143/HAS_NWAY/
+* Cleanup 21041 mode reporting
+* Small code cleanups
+
+0.9.4.1 (March 18, 2000):
+* Finish PCI DMA conversion (davem)
+* Do not netif_start_queue() at end of tulip_tx_timeout() (kuznet)
+* PCI DMA fix (kuznet)
+* eeprom.c code cleanup
+* Remove Xircom Tulip crud
+
+
 [EOF]
 
diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README
index 4d8298772..868feedb9 100644
--- a/Documentation/video4linux/bttv/README
+++ b/Documentation/video4linux/bttv/README
@@ -84,6 +84,13 @@ trouble with some specific TV card, try to ask there instead of
 mailing me directly.  The chance that someone with the same card
 listens there is much higher...
 
+For problems with sound:  There are alot of different systems used
+for TV sound all over the world.  And there are also different chips
+which decode the audio signal.  Reports about sound problems ("stereo
+does'nt work") are pretty useless unless you include some details
+about your hardware and the TV sound scheme used in your country (or
+at least the country you are living in).
+
 
 Finally: If you mail some patches for bttv around the world (to
 linux-kernel/Alan/Linus/...), please Cc: me.