Przeglądaj źródła

Create/use more directory structure in the Documentation/ tree.

Create Documentation/blockdev/ sub-directory and populate it.
Populate the Documentation/serial/ sub-directory.
Move MSI-HOWTO.txt to Documentation/PCI/.
Move ioctl-number.txt to Documentation/ioctl/.
Update all relevant 00-INDEX files.
Update all relevant Kconfig files and source files.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Randy Dunlap 16 lat temu
rodzic
commit
31c00fc15e

+ 2 - 40
Documentation/00-INDEX

@@ -42,14 +42,8 @@ IRQ.txt
 	- description of what an IRQ is.
 	- description of what an IRQ is.
 ManagementStyle
 ManagementStyle
 	- how to (attempt to) manage kernel hackers.
 	- how to (attempt to) manage kernel hackers.
-MSI-HOWTO.txt
-	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
 RCU/
 RCU/
 	- directory with info on RCU (read-copy update).
 	- directory with info on RCU (read-copy update).
-README.DAC960
-	- info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
-README.cycladesZ
-	- info on Cyclades-Z firmware loading.
 SAK.txt
 SAK.txt
 	- info on Secure Attention Keys.
 	- info on Secure Attention Keys.
 SM501.txt
 SM501.txt
@@ -86,20 +80,16 @@ blackfin/
 	- directory with documentation for the Blackfin arch.
 	- directory with documentation for the Blackfin arch.
 block/
 block/
 	- info on the Block I/O (BIO) layer.
 	- info on the Block I/O (BIO) layer.
+blockdev/
+	- info on block devices & drivers
 cachetlb.txt
 cachetlb.txt
 	- describes the cache/TLB flushing interfaces Linux uses.
 	- describes the cache/TLB flushing interfaces Linux uses.
-cciss.txt
-	- info, major/minor #'s for Compaq's SMART Array Controllers.
 cdrom/
 cdrom/
 	- directory with information on the CD-ROM drivers that Linux has.
 	- directory with information on the CD-ROM drivers that Linux has.
-computone.txt
-	- info on Computone Intelliport II/Plus Multiport Serial Driver.
 connector/
 connector/
 	- docs on the netlink based userspace<->kernel space communication mod.
 	- docs on the netlink based userspace<->kernel space communication mod.
 console/
 console/
 	- documentation on Linux console drivers.
 	- documentation on Linux console drivers.
-cpqarray.txt
-	- info on using Compaq's SMART2 Intelligent Disk Array Controllers.
 cpu-freq/
 cpu-freq/
 	- info on CPU frequency and voltage scaling.
 	- info on CPU frequency and voltage scaling.
 cpu-hotplug.txt
 cpu-hotplug.txt
@@ -126,8 +116,6 @@ device-mapper/
 	- directory with info on Device Mapper.
 	- directory with info on Device Mapper.
 devices.txt
 devices.txt
 	- plain ASCII listing of all the nodes in /dev/ with major minor #'s.
 	- plain ASCII listing of all the nodes in /dev/ with major minor #'s.
-digiepca.txt
-	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
 dontdiff
 dontdiff
 	- file containing a list of files that should never be diff'ed.
 	- file containing a list of files that should never be diff'ed.
 driver-model/
 driver-model/
@@ -152,14 +140,10 @@ filesystems/
 	- info on the vfs and the various filesystems that Linux supports.
 	- info on the vfs and the various filesystems that Linux supports.
 firmware_class/
 firmware_class/
 	- request_firmware() hotplug interface info.
 	- request_firmware() hotplug interface info.
-floppy.txt
-	- notes and driver options for the floppy disk driver.
 frv/
 frv/
 	- Fujitsu FR-V Linux documentation.
 	- Fujitsu FR-V Linux documentation.
 gpio.txt
 gpio.txt
 	- overview of GPIO (General Purpose Input/Output) access conventions.
 	- overview of GPIO (General Purpose Input/Output) access conventions.
-hayes-esp.txt
-	- info on using the Hayes ESP serial driver.
 highuid.txt
 highuid.txt
 	- notes on the change from 16 bit to 32 bit user/group IDs.
 	- notes on the change from 16 bit to 32 bit user/group IDs.
 timers/
 timers/
@@ -186,8 +170,6 @@ io_ordering.txt
 	- info on ordering I/O writes to memory-mapped addresses.
 	- info on ordering I/O writes to memory-mapped addresses.
 ioctl/
 ioctl/
 	- directory with documents describing various IOCTL calls.
 	- directory with documents describing various IOCTL calls.
-ioctl-number.txt
-	- how to implement and register device/driver ioctl calls.
 iostats.txt
 iostats.txt
 	- info on I/O statistics Linux kernel provides.
 	- info on I/O statistics Linux kernel provides.
 irqflags-tracing.txt
 irqflags-tracing.txt
@@ -250,14 +232,10 @@ mips/
 	- directory with info about Linux on MIPS architecture.
 	- directory with info about Linux on MIPS architecture.
 mono.txt
 mono.txt
 	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
 	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
-moxa-smartio
-	- file with info on installing/using Moxa multiport serial driver.
 mutex-design.txt
 mutex-design.txt
 	- info on the generic mutex subsystem.
 	- info on the generic mutex subsystem.
 namespaces/
 namespaces/
 	- directory with various information about namespaces
 	- directory with various information about namespaces
-nbd.txt
-	- info on a TCP implementation of a network block device.
 netlabel/
 netlabel/
 	- directory with information on the NetLabel subsystem.
 	- directory with information on the NetLabel subsystem.
 networking/
 networking/
@@ -270,8 +248,6 @@ numastat.txt
 	- info on how to read Numa policy hit/miss statistics in sysfs.
 	- info on how to read Numa policy hit/miss statistics in sysfs.
 oops-tracing.txt
 oops-tracing.txt
 	- how to decode those nasty internal kernel error dump messages.
 	- how to decode those nasty internal kernel error dump messages.
-paride.txt
-	- information about the parallel port IDE subsystem.
 parisc/
 parisc/
 	- directory with info on using Linux on PA-RISC architecture.
 	- directory with info on using Linux on PA-RISC architecture.
 parport.txt
 parport.txt
@@ -292,18 +268,12 @@ preempt-locking.txt
 	- info on locking under a preemptive kernel.
 	- info on locking under a preemptive kernel.
 prio_tree.txt
 prio_tree.txt
 	- info on radix-priority-search-tree use for indexing vmas.
 	- info on radix-priority-search-tree use for indexing vmas.
-ramdisk.txt
-	- short guide on how to set up and use the RAM disk.
 rbtree.txt
 rbtree.txt
 	- info on what red-black trees are and what they are for.
 	- info on what red-black trees are and what they are for.
-riscom8.txt
-	- notes on using the RISCom/8 multi-port serial driver.
 robust-futex-ABI.txt
 robust-futex-ABI.txt
 	- documentation of the robust futex ABI.
 	- documentation of the robust futex ABI.
 robust-futexes.txt
 robust-futexes.txt
 	- a description of what robust futexes are.
 	- a description of what robust futexes are.
-rocket.txt
-	- info on the Comtrol RocketPort multiport serial driver.
 rt-mutex-design.txt
 rt-mutex-design.txt
 	- description of the RealTime mutex implementation design.
 	- description of the RealTime mutex implementation design.
 rt-mutex.txt
 rt-mutex.txt
@@ -332,8 +302,6 @@ sparc/
 	- directory with info on using Linux on Sparc architecture.
 	- directory with info on using Linux on Sparc architecture.
 sparse.txt
 sparse.txt
 	- info on how to obtain and use the sparse tool for typechecking.
 	- info on how to obtain and use the sparse tool for typechecking.
-specialix.txt
-	- info on hardware/driver for specialix IO8+ multiport serial card.
 spi/
 spi/
 	- overview of Linux kernel Serial Peripheral Interface (SPI) support.
 	- overview of Linux kernel Serial Peripheral Interface (SPI) support.
 spinlocks.txt
 spinlocks.txt
@@ -342,14 +310,10 @@ stable_api_nonsense.txt
 	- info on why the kernel does not have a stable in-kernel api or abi.
 	- info on why the kernel does not have a stable in-kernel api or abi.
 stable_kernel_rules.txt
 stable_kernel_rules.txt
 	- rules and procedures for the -stable kernel releases.
 	- rules and procedures for the -stable kernel releases.
-stallion.txt
-	- info on using the Stallion multiport serial driver.
 svga.txt
 svga.txt
 	- short guide on selecting video modes at boot via VGA BIOS.
 	- short guide on selecting video modes at boot via VGA BIOS.
 sysfs-rules.txt
 sysfs-rules.txt
 	- How not to use sysfs.
 	- How not to use sysfs.
-sx.txt
-	- info on the Specialix SX/SI multiport serial driver.
 sysctl/
 sysctl/
 	- directory with info on the /proc/sys/* files.
 	- directory with info on the /proc/sys/* files.
 sysrq.txt
 sysrq.txt
@@ -358,8 +322,6 @@ telephony/
 	- directory with info on telephony (e.g. voice over IP) support.
 	- directory with info on telephony (e.g. voice over IP) support.
 time_interpolators.txt
 time_interpolators.txt
 	- info on time interpolators.
 	- info on time interpolators.
-tty.txt
-	- guide to the locking policies of the tty layer.
 uml/
 uml/
 	- directory with information about User Mode Linux.
 	- directory with information about User Mode Linux.
 unicode.txt
 unicode.txt

+ 2 - 0
Documentation/PCI/00-INDEX

@@ -1,5 +1,7 @@
 00-INDEX
 00-INDEX
 	- this file
 	- this file
+MSI-HOWTO.txt
+	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
 PCI-DMA-mapping.txt
 PCI-DMA-mapping.txt
 	- info for PCI drivers using DMA portably across all platforms
 	- info for PCI drivers using DMA portably across all platforms
 PCIEBUS-HOWTO.txt
 PCIEBUS-HOWTO.txt

+ 0 - 0
Documentation/MSI-HOWTO.txt → Documentation/PCI/MSI-HOWTO.txt


+ 16 - 0
Documentation/blockdev/00-INDEX

@@ -0,0 +1,16 @@
+00-INDEX
+	- this file
+README.DAC960
+	- info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
+cciss.txt
+	- info, major/minor #'s for Compaq's SMART Array Controllers.
+cpqarray.txt
+	- info on using Compaq's SMART2 Intelligent Disk Array Controllers.
+floppy.txt
+	- notes and driver options for the floppy disk driver.
+nbd.txt
+	- info on a TCP implementation of a network block device.
+paride.txt
+	- information about the parallel port IDE subsystem.
+ramdisk.txt
+	- short guide on how to set up and use the RAM disk.

+ 0 - 0
Documentation/README.DAC960 → Documentation/blockdev/README.DAC960


+ 0 - 0
Documentation/cciss.txt → Documentation/blockdev/cciss.txt


+ 0 - 0
Documentation/cpqarray.txt → Documentation/blockdev/cpqarray.txt


+ 0 - 0
Documentation/floppy.txt → Documentation/blockdev/floppy.txt


+ 0 - 0
Documentation/nbd.txt → Documentation/blockdev/nbd.txt


+ 0 - 0
Documentation/paride.txt → Documentation/blockdev/paride.txt


+ 0 - 0
Documentation/ramdisk.txt → Documentation/blockdev/ramdisk.txt


+ 10 - 0
Documentation/ioctl/00-INDEX

@@ -0,0 +1,10 @@
+00-INDEX
+	- this file
+cdrom.txt
+	- summary of CDROM ioctl calls
+hdio.txt
+	- summary of HDIO_ ioctl calls
+ioctl-decoding.txt
+	- how to decode the bits of an IOCTL code
+ioctl-number.txt
+	- how to implement and register device/driver ioctl calls

+ 0 - 0
Documentation/ioctl-number.txt → Documentation/ioctl/ioctl-number.txt


+ 12 - 12
Documentation/kernel-parameters.txt

@@ -629,7 +629,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 
 	digiepca=	[HW,SERIAL]
 	digiepca=	[HW,SERIAL]
 			See drivers/char/README.epca and
 			See drivers/char/README.epca and
-			Documentation/digiepca.txt.
+			Documentation/serial/digiepca.txt.
 
 
 	disable_mtrr_cleanup [X86]
 	disable_mtrr_cleanup [X86]
 	enable_mtrr_cleanup [X86]
 	enable_mtrr_cleanup [X86]
@@ -740,7 +740,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See header of drivers/scsi/fdomain.c.
 			See header of drivers/scsi/fdomain.c.
 
 
 	floppy=		[HW]
 	floppy=		[HW]
-			See Documentation/floppy.txt.
+			See Documentation/blockdev/floppy.txt.
 
 
 	force_pal_cache_flush
 	force_pal_cache_flush
 			[IA-64] Avoid check_sal_cache_flush which may hang on
 			[IA-64] Avoid check_sal_cache_flush which may hang on
@@ -1101,7 +1101,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			the same attribute, the last one is used.
 			the same attribute, the last one is used.
 
 
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
 	load_ramdisk=	[RAM] List of ramdisks to load from floppy
-			See Documentation/ramdisk.txt.
+			See Documentation/blockdev/ramdisk.txt.
 
 
 	lockd.nlm_grace_period=P  [NFS] Assign grace period.
 	lockd.nlm_grace_period=P  [NFS] Assign grace period.
 			Format: <integer>
 			Format: <integer>
@@ -1596,7 +1596,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 
 	pcd.		[PARIDE]
 	pcd.		[PARIDE]
 			See header of drivers/block/paride/pcd.c.
 			See header of drivers/block/paride/pcd.c.
-			See also Documentation/paride.txt.
+			See also Documentation/blockdev/paride.txt.
 
 
 	pci=option[,option...]	[PCI] various PCI subsystem options:
 	pci=option[,option...]	[PCI] various PCI subsystem options:
 		off		[X86] don't probe for the PCI bus
 		off		[X86] don't probe for the PCI bus
@@ -1697,7 +1697,7 @@ and is between 256 and 4096 characters. It is defined in the file
 	pcmv=		[HW,PCMCIA] BadgePAD 4
 	pcmv=		[HW,PCMCIA] BadgePAD 4
 
 
 	pd.		[PARIDE]
 	pd.		[PARIDE]
-			See Documentation/paride.txt.
+			See Documentation/blockdev/paride.txt.
 
 
 	pdcchassis=	[PARISC,HW] Disable/Enable PDC Chassis Status codes at
 	pdcchassis=	[PARISC,HW] Disable/Enable PDC Chassis Status codes at
 			boot time.
 			boot time.
@@ -1705,10 +1705,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			See arch/parisc/kernel/pdc_chassis.c
 			See arch/parisc/kernel/pdc_chassis.c
 
 
 	pf.		[PARIDE]
 	pf.		[PARIDE]
-			See Documentation/paride.txt.
+			See Documentation/blockdev/paride.txt.
 
 
 	pg.		[PARIDE]
 	pg.		[PARIDE]
-			See Documentation/paride.txt.
+			See Documentation/blockdev/paride.txt.
 
 
 	pirq=		[SMP,APIC] Manual mp-table setup
 	pirq=		[SMP,APIC] Manual mp-table setup
 			See Documentation/x86/i386/IO-APIC.txt.
 			See Documentation/x86/i386/IO-APIC.txt.
@@ -1778,7 +1778,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 
 	prompt_ramdisk=	[RAM] List of RAM disks to prompt for floppy disk
 	prompt_ramdisk=	[RAM] List of RAM disks to prompt for floppy disk
 			before loading.
 			before loading.
-			See Documentation/ramdisk.txt.
+			See Documentation/blockdev/ramdisk.txt.
 
 
 	psmouse.proto=	[HW,MOUSE] Highest PS2 mouse protocol extension to
 	psmouse.proto=	[HW,MOUSE] Highest PS2 mouse protocol extension to
 			probe for; one of (bare|imps|exps|lifebook|any).
 			probe for; one of (bare|imps|exps|lifebook|any).
@@ -1798,7 +1798,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			<io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
 			<io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
 
 
 	pt.		[PARIDE]
 	pt.		[PARIDE]
-			See Documentation/paride.txt.
+			See Documentation/blockdev/paride.txt.
 
 
 	pty.legacy_count=
 	pty.legacy_count=
 			[KNL] Number of legacy pty's. Overwrites compiled-in
 			[KNL] Number of legacy pty's. Overwrites compiled-in
@@ -1812,10 +1812,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/md.txt.
 			See Documentation/md.txt.
 
 
 	ramdisk_blocksize=	[RAM]
 	ramdisk_blocksize=	[RAM]
-			See Documentation/ramdisk.txt.
+			See Documentation/blockdev/ramdisk.txt.
 
 
 	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
 	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
-			See Documentation/ramdisk.txt.
+			See Documentation/blockdev/ramdisk.txt.
 
 
 	rcupdate.blimit=	[KNL,BOOT]
 	rcupdate.blimit=	[KNL,BOOT]
 			Set maximum number of finished RCU callbacks to process
 			Set maximum number of finished RCU callbacks to process
@@ -2147,7 +2147,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/sonypi.txt
 			See Documentation/sonypi.txt
 
 
 	specialix=	[HW,SERIAL] Specialix multi-serial port adapter
 	specialix=	[HW,SERIAL] Specialix multi-serial port adapter
-			See Documentation/specialix.txt.
+			See Documentation/serial/specialix.txt.
 
 
 	spia_io_base=	[HW,MTD]
 	spia_io_base=	[HW,MTD]
 	spia_fio_base=
 	spia_fio_base=

+ 24 - 0
Documentation/serial/00-INDEX

@@ -0,0 +1,24 @@
+00-INDEX
+	- this file.
+README.cycladesZ
+	- info on Cyclades-Z firmware loading.
+computone.txt
+	- info on Computone Intelliport II/Plus Multiport Serial Driver.
+digiepca.txt
+	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
+hayes-esp.txt
+	- info on using the Hayes ESP serial driver.
+moxa-smartio
+	- file with info on installing/using Moxa multiport serial driver.
+riscom8.txt
+	- notes on using the RISCom/8 multi-port serial driver.
+rocket.txt
+	- info on the Comtrol RocketPort multiport serial driver.
+specialix.txt
+	- info on hardware/driver for specialix IO8+ multiport serial card.
+stallion.txt
+	- info on using the Stallion multiport serial driver.
+sx.txt
+	- info on the Specialix SX/SI multiport serial driver.
+tty.txt
+	- guide to the locking policies of the tty layer.

+ 0 - 0
Documentation/README.cycladesZ → Documentation/serial/README.cycladesZ


+ 1 - 1
Documentation/computone.txt → Documentation/serial/computone.txt

@@ -247,7 +247,7 @@ shar archive to make it easier to extract the script from the documentation.
 To create the ip2mkdev shell script change to a convenient directory (/tmp
 To create the ip2mkdev shell script change to a convenient directory (/tmp
 works just fine) and run the following command:
 works just fine) and run the following command:
 
 
-	unshar Documentation/computone.txt
+	unshar Documentation/serial/computone.txt
 		(This file)
 		(This file)
 
 
 You should now have a file ip2mkdev in your current working directory with
 You should now have a file ip2mkdev in your current working directory with

+ 0 - 0
Documentation/digiepca.txt → Documentation/serial/digiepca.txt


+ 0 - 0
Documentation/hayes-esp.txt → Documentation/serial/hayes-esp.txt


+ 0 - 0
Documentation/moxa-smartio → Documentation/serial/moxa-smartio


+ 0 - 0
Documentation/riscom8.txt → Documentation/serial/riscom8.txt


+ 0 - 0
Documentation/rocket.txt → Documentation/serial/rocket.txt


+ 0 - 0
Documentation/specialix.txt → Documentation/serial/specialix.txt


+ 0 - 0
Documentation/stallion.txt → Documentation/serial/stallion.txt


+ 0 - 0
Documentation/sx.txt → Documentation/serial/sx.txt


+ 0 - 0
Documentation/tty.txt → Documentation/serial/tty.txt


+ 15 - 14
drivers/block/Kconfig

@@ -21,7 +21,8 @@ config BLK_DEV_FD
 	---help---
 	---help---
 	  If you want to use the floppy disk drive(s) of your PC under Linux,
 	  If you want to use the floppy disk drive(s) of your PC under Linux,
 	  say Y. Information about this driver, especially important for IBM
 	  say Y. Information about this driver, especially important for IBM
-	  Thinkpad users, is contained in <file:Documentation/floppy.txt>.
+	  Thinkpad users, is contained in
+	  <file:Documentation/blockdev/floppy.txt>.
 	  That file also contains the location of the Floppy driver FAQ as
 	  That file also contains the location of the Floppy driver FAQ as
 	  well as location of the fdutils package used to configure additional
 	  well as location of the fdutils package used to configure additional
 	  parameters of the driver at run time.
 	  parameters of the driver at run time.
@@ -76,7 +77,7 @@ config PARIDE
 	  your computer's parallel port. Most of them are actually IDE devices
 	  your computer's parallel port. Most of them are actually IDE devices
 	  using a parallel port IDE adapter. This option enables the PARIDE
 	  using a parallel port IDE adapter. This option enables the PARIDE
 	  subsystem which contains drivers for many of these external drives.
 	  subsystem which contains drivers for many of these external drives.
-	  Read <file:Documentation/paride.txt> for more information.
+	  Read <file:Documentation/blockdev/paride.txt> for more information.
 
 
 	  If you have said Y to the "Parallel-port support" configuration
 	  If you have said Y to the "Parallel-port support" configuration
 	  option, you may share a single port between your printer and other
 	  option, you may share a single port between your printer and other
@@ -114,9 +115,9 @@ config BLK_CPQ_DA
 	help
 	help
 	  This is the driver for Compaq Smart Array controllers.  Everyone
 	  This is the driver for Compaq Smart Array controllers.  Everyone
 	  using these boards should say Y here.  See the file
 	  using these boards should say Y here.  See the file
-	  <file:Documentation/cpqarray.txt> for the current list of boards
-	  supported by this driver, and for further information on the use of
-	  this driver.
+	  <file:Documentation/blockdev/cpqarray.txt> for the current list of
+	  boards supported by this driver, and for further information on the
+	  use of this driver.
 
 
 config BLK_CPQ_CISS_DA
 config BLK_CPQ_CISS_DA
 	tristate "Compaq Smart Array 5xxx support"
 	tristate "Compaq Smart Array 5xxx support"
@@ -124,7 +125,7 @@ config BLK_CPQ_CISS_DA
 	help
 	help
 	  This is the driver for Compaq Smart Array 5xxx controllers.
 	  This is the driver for Compaq Smart Array 5xxx controllers.
 	  Everyone using these boards should say Y here.
 	  Everyone using these boards should say Y here.
-	  See <file:Documentation/cciss.txt> for the current list of
+	  See <file:Documentation/blockdev/cciss.txt> for the current list of
 	  boards supported by this driver, and for further information
 	  boards supported by this driver, and for further information
 	  on the use of this driver.
 	  on the use of this driver.
 
 
@@ -135,7 +136,7 @@ config CISS_SCSI_TAPE
 	help
 	help
 	  When enabled (Y), this option allows SCSI tape drives and SCSI medium
 	  When enabled (Y), this option allows SCSI tape drives and SCSI medium
 	  changers (tape robots) to be accessed via a Compaq 5xxx array 
 	  changers (tape robots) to be accessed via a Compaq 5xxx array 
-	  controller.  (See <file:Documentation/cciss.txt> for more details.)
+	  controller.  (See <file:Documentation/blockdev/cciss.txt> for more details.)
 
 
 	  "SCSI support" and "SCSI tape support" must also be enabled for this 
 	  "SCSI support" and "SCSI tape support" must also be enabled for this 
 	  option to work.
 	  option to work.
@@ -149,8 +150,8 @@ config BLK_DEV_DAC960
 	help
 	help
 	  This driver adds support for the Mylex DAC960, AcceleRAID, and
 	  This driver adds support for the Mylex DAC960, AcceleRAID, and
 	  eXtremeRAID PCI RAID controllers.  See the file
 	  eXtremeRAID PCI RAID controllers.  See the file
-	  <file:Documentation/README.DAC960> for further information about
-	  this driver.
+	  <file:Documentation/blockdev/README.DAC960> for further information
+	  about this driver.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called DAC960.
 	  module will be called DAC960.
@@ -278,9 +279,9 @@ config BLK_DEV_NBD
 	  userland (making server and client physically the same computer,
 	  userland (making server and client physically the same computer,
 	  communicating using the loopback network device).
 	  communicating using the loopback network device).
 
 
-	  Read <file:Documentation/nbd.txt> for more information, especially
-	  about where to find the server code, which runs in user space and
-	  does not need special kernel support.
+	  Read <file:Documentation/blockdev/nbd.txt> for more information,
+	  especially about where to find the server code, which runs in user
+	  space and does not need special kernel support.
 
 
 	  Note that this has nothing to do with the network file systems NFS
 	  Note that this has nothing to do with the network file systems NFS
 	  or Coda; you can say N here even if you intend to use NFS or Coda.
 	  or Coda; you can say N here even if you intend to use NFS or Coda.
@@ -321,8 +322,8 @@ config BLK_DEV_RAM
 	  store a copy of a minimal root file system off of a floppy into RAM
 	  store a copy of a minimal root file system off of a floppy into RAM
 	  during the initial install of Linux.
 	  during the initial install of Linux.
 
 
-	  Note that the kernel command line option "ramdisk=XX" is now
-	  obsolete. For details, read <file:Documentation/ramdisk.txt>.
+	  Note that the kernel command line option "ramdisk=XX" is now obsolete.
+	  For details, read <file:Documentation/blockdev/ramdisk.txt>.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called rd.
 	  module will be called rd.

+ 1 - 1
drivers/block/floppy.c

@@ -4124,7 +4124,7 @@ static int __init floppy_setup(char *str)
 		printk("\n");
 		printk("\n");
 	} else
 	} else
 		DPRINT("botched floppy option\n");
 		DPRINT("botched floppy option\n");
-	DPRINT("Read Documentation/floppy.txt\n");
+	DPRINT("Read Documentation/blockdev/floppy.txt\n");
 	return 0;
 	return 0;
 }
 }
 
 

+ 12 - 12
drivers/char/Kconfig

@@ -124,7 +124,7 @@ config COMPUTONE
 	  which give you many serial ports. You would need something like this
 	  which give you many serial ports. You would need something like this
 	  to connect more than two modems to your Linux box, for instance in
 	  to connect more than two modems to your Linux box, for instance in
 	  order to become a dial-in server. If you have a card like that, say
 	  order to become a dial-in server. If you have a card like that, say
-	  Y here and read <file:Documentation/computone.txt>.
+	  Y here and read <file:Documentation/serial/computone.txt>.
 
 
 	  To compile this driver as module, choose M here: the
 	  To compile this driver as module, choose M here: the
 	  module will be called ip2.
 	  module will be called ip2.
@@ -136,7 +136,7 @@ config ROCKETPORT
 	  This driver supports Comtrol RocketPort and RocketModem PCI boards.   
 	  This driver supports Comtrol RocketPort and RocketModem PCI boards.   
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
           modems.  For information about the RocketPort/RocketModem  boards
           modems.  For information about the RocketPort/RocketModem  boards
-          and this driver read <file:Documentation/rocket.txt>.
+          and this driver read <file:Documentation/serial/rocket.txt>.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called rocket.
 	  module will be called rocket.
@@ -154,7 +154,7 @@ config CYCLADES
 	  your Linux box, for instance in order to become a dial-in server.
 	  your Linux box, for instance in order to become a dial-in server.
 
 
 	  For information about the Cyclades-Z card, read
 	  For information about the Cyclades-Z card, read
-	  <file:Documentation/README.cycladesZ>.
+	  <file:Documentation/serial/README.cycladesZ>.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called cyclades.
 	  module will be called cyclades.
@@ -183,7 +183,7 @@ config DIGIEPCA
 	  box, for instance in order to become a dial-in server. This driver
 	  box, for instance in order to become a dial-in server. This driver
 	  supports the original PC (ISA) boards as well as PCI, and EISA. If
 	  supports the original PC (ISA) boards as well as PCI, and EISA. If
 	  you have a card like this, say Y here and read the file
 	  you have a card like this, say Y here and read the file
-	  <file:Documentation/digiepca.txt>.
+	  <file:Documentation/serial/digiepca.txt>.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called epca.
 	  module will be called epca.
@@ -289,7 +289,7 @@ config RISCOM8
 	  which gives you many serial ports. You would need something like
 	  which gives you many serial ports. You would need something like
 	  this to connect more than two modems to your Linux box, for instance
 	  this to connect more than two modems to your Linux box, for instance
 	  in order to become a dial-in server. If you have a card like that,
 	  in order to become a dial-in server. If you have a card like that,
-	  say Y here and read the file <file:Documentation/riscom8.txt>.
+	  say Y here and read the file <file:Documentation/serial/riscom8.txt>.
 
 
 	  Also it's possible to say M here and compile this driver as kernel
 	  Also it's possible to say M here and compile this driver as kernel
 	  loadable module; the module will be called riscom8.
 	  loadable module; the module will be called riscom8.
@@ -304,8 +304,8 @@ config SPECIALIX
 	  your Linux box, for instance in order to become a dial-in server.
 	  your Linux box, for instance in order to become a dial-in server.
 
 
 	  If you have a card like that, say Y here and read the file
 	  If you have a card like that, say Y here and read the file
-	  <file:Documentation/specialix.txt>. Also it's possible to say M here
-	  and compile this driver as kernel loadable module which will be
+	  <file:Documentation/serial/specialix.txt>. Also it's possible to say
+	  M here and compile this driver as kernel loadable module which will be
 	  called specialix.
 	  called specialix.
 
 
 config SX
 config SX
@@ -313,7 +313,7 @@ config SX
 	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
 	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
 	help
 	help
 	  This is a driver for the SX and SI multiport serial cards.
 	  This is a driver for the SX and SI multiport serial cards.
-	  Please read the file <file:Documentation/sx.txt> for details.
+	  Please read the file <file:Documentation/serial/sx.txt> for details.
 
 
 	  This driver can only be built as a module ( = code which can be
 	  This driver can only be built as a module ( = code which can be
 	  inserted in and removed from the running kernel whenever you want).
 	  inserted in and removed from the running kernel whenever you want).
@@ -344,8 +344,8 @@ config STALDRV
 	  like this to connect more than two modems to your Linux box, for
 	  like this to connect more than two modems to your Linux box, for
 	  instance in order to become a dial-in server.  If you say Y here,
 	  instance in order to become a dial-in server.  If you say Y here,
 	  you will be asked for your specific card model in the next
 	  you will be asked for your specific card model in the next
-	  questions.  Make sure to read <file:Documentation/stallion.txt> in
-	  this case.  If you have never heard about all this, it's safe to
+	  questions.  Make sure to read <file:Documentation/serial/stallion.txt>
+	  in this case.  If you have never heard about all this, it's safe to
 	  say N.
 	  say N.
 
 
 config STALLION
 config STALLION
@@ -354,7 +354,7 @@ config STALLION
 	help
 	help
 	  If you have an EasyIO or EasyConnection 8/32 multiport Stallion
 	  If you have an EasyIO or EasyConnection 8/32 multiport Stallion
 	  card, then this is for you; say Y.  Make sure to read
 	  card, then this is for you; say Y.  Make sure to read
-	  <file:Documentation/stallion.txt>.
+	  <file:Documentation/serial/stallion.txt>.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called stallion.
 	  module will be called stallion.
@@ -365,7 +365,7 @@ config ISTALLION
 	help
 	help
 	  If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
 	  If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
 	  serial multiport card, say Y here. Make sure to read
 	  serial multiport card, say Y here. Make sure to read
-	  <file:Documentation/stallion.txt>.
+	  <file:Documentation/serial/stallion.txt>.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called istallion.
 	  module will be called istallion.

+ 1 - 1
drivers/char/specialix.c

@@ -72,7 +72,7 @@
 /*
 /*
  * There is a bunch of documentation about the card, jumpers, config
  * There is a bunch of documentation about the card, jumpers, config
  * settings, restrictions, cables, device names and numbers in
  * settings, restrictions, cables, device names and numbers in
- * Documentation/specialix.txt
+ * Documentation/serial/specialix.txt
  */
  */
 
 
 #include <linux/module.h>
 #include <linux/module.h>