aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 14:51:03 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 14:51:03 -0500
commitfab349cceb25f92bac1400601c5ef8345a166958 (patch)
treeaba18d45b3620a210a939777857853c67a61d5c3
parentd091c2f58ba32029495a933b721e8e02fbd12caa (diff)
parent31c00fc15ebd35c1647775dbfc167a15d46657fd (diff)
Merge branch 'doc-subdirs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs
* 'doc-subdirs' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: Create/use more directory structure in the Documentation/ tree.
-rw-r--r--Documentation/00-INDEX42
-rw-r--r--Documentation/PCI/00-INDEX2
-rw-r--r--Documentation/PCI/MSI-HOWTO.txt (renamed from Documentation/MSI-HOWTO.txt)0
-rw-r--r--Documentation/blockdev/00-INDEX16
-rw-r--r--Documentation/blockdev/README.DAC960 (renamed from Documentation/README.DAC960)0
-rw-r--r--Documentation/blockdev/cciss.txt (renamed from Documentation/cciss.txt)0
-rw-r--r--Documentation/blockdev/cpqarray.txt (renamed from Documentation/cpqarray.txt)0
-rw-r--r--Documentation/blockdev/floppy.txt (renamed from Documentation/floppy.txt)0
-rw-r--r--Documentation/blockdev/nbd.txt (renamed from Documentation/nbd.txt)0
-rw-r--r--Documentation/blockdev/paride.txt (renamed from Documentation/paride.txt)0
-rw-r--r--Documentation/blockdev/ramdisk.txt (renamed from Documentation/ramdisk.txt)0
-rw-r--r--Documentation/ioctl/00-INDEX10
-rw-r--r--Documentation/ioctl/ioctl-number.txt (renamed from Documentation/ioctl-number.txt)0
-rw-r--r--Documentation/kernel-parameters.txt24
-rw-r--r--Documentation/serial/00-INDEX24
-rw-r--r--Documentation/serial/README.cycladesZ (renamed from Documentation/README.cycladesZ)0
-rw-r--r--Documentation/serial/computone.txt (renamed from Documentation/computone.txt)2
-rw-r--r--Documentation/serial/digiepca.txt (renamed from Documentation/digiepca.txt)0
-rw-r--r--Documentation/serial/hayes-esp.txt (renamed from Documentation/hayes-esp.txt)0
-rw-r--r--Documentation/serial/moxa-smartio (renamed from Documentation/moxa-smartio)0
-rw-r--r--Documentation/serial/riscom8.txt (renamed from Documentation/riscom8.txt)0
-rw-r--r--Documentation/serial/rocket.txt (renamed from Documentation/rocket.txt)0
-rw-r--r--Documentation/serial/specialix.txt (renamed from Documentation/specialix.txt)0
-rw-r--r--Documentation/serial/stallion.txt (renamed from Documentation/stallion.txt)0
-rw-r--r--Documentation/serial/sx.txt (renamed from Documentation/sx.txt)0
-rw-r--r--Documentation/serial/tty.txt (renamed from Documentation/tty.txt)0
-rw-r--r--drivers/block/Kconfig29
-rw-r--r--drivers/block/floppy.c2
-rw-r--r--drivers/char/Kconfig24
-rw-r--r--drivers/char/specialix.c2
30 files changed, 96 insertions, 81 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 50f99eab0e1f..2a39aeba1464 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -42,14 +42,8 @@ IRQ.txt
42 - description of what an IRQ is. 42 - description of what an IRQ is.
43ManagementStyle 43ManagementStyle
44 - how to (attempt to) manage kernel hackers. 44 - how to (attempt to) manage kernel hackers.
45MSI-HOWTO.txt
46 - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
47RCU/ 45RCU/
48 - directory with info on RCU (read-copy update). 46 - directory with info on RCU (read-copy update).
49README.DAC960
50 - info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
51README.cycladesZ
52 - info on Cyclades-Z firmware loading.
53SAK.txt 47SAK.txt
54 - info on Secure Attention Keys. 48 - info on Secure Attention Keys.
55SM501.txt 49SM501.txt
@@ -86,20 +80,16 @@ blackfin/
86 - directory with documentation for the Blackfin arch. 80 - directory with documentation for the Blackfin arch.
87block/ 81block/
88 - info on the Block I/O (BIO) layer. 82 - info on the Block I/O (BIO) layer.
83blockdev/
84 - info on block devices & drivers
89cachetlb.txt 85cachetlb.txt
90 - describes the cache/TLB flushing interfaces Linux uses. 86 - describes the cache/TLB flushing interfaces Linux uses.
91cciss.txt
92 - info, major/minor #'s for Compaq's SMART Array Controllers.
93cdrom/ 87cdrom/
94 - directory with information on the CD-ROM drivers that Linux has. 88 - directory with information on the CD-ROM drivers that Linux has.
95computone.txt
96 - info on Computone Intelliport II/Plus Multiport Serial Driver.
97connector/ 89connector/
98 - docs on the netlink based userspace<->kernel space communication mod. 90 - docs on the netlink based userspace<->kernel space communication mod.
99console/ 91console/
100 - documentation on Linux console drivers. 92 - documentation on Linux console drivers.
101cpqarray.txt
102 - info on using Compaq's SMART2 Intelligent Disk Array Controllers.
103cpu-freq/ 93cpu-freq/
104 - info on CPU frequency and voltage scaling. 94 - info on CPU frequency and voltage scaling.
105cpu-hotplug.txt 95cpu-hotplug.txt
@@ -126,8 +116,6 @@ device-mapper/
126 - directory with info on Device Mapper. 116 - directory with info on Device Mapper.
127devices.txt 117devices.txt
128 - plain ASCII listing of all the nodes in /dev/ with major minor #'s. 118 - plain ASCII listing of all the nodes in /dev/ with major minor #'s.
129digiepca.txt
130 - info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
131dontdiff 119dontdiff
132 - file containing a list of files that should never be diff'ed. 120 - file containing a list of files that should never be diff'ed.
133driver-model/ 121driver-model/
@@ -152,14 +140,10 @@ filesystems/
152 - info on the vfs and the various filesystems that Linux supports. 140 - info on the vfs and the various filesystems that Linux supports.
153firmware_class/ 141firmware_class/
154 - request_firmware() hotplug interface info. 142 - request_firmware() hotplug interface info.
155floppy.txt
156 - notes and driver options for the floppy disk driver.
157frv/ 143frv/
158 - Fujitsu FR-V Linux documentation. 144 - Fujitsu FR-V Linux documentation.
159gpio.txt 145gpio.txt
160 - overview of GPIO (General Purpose Input/Output) access conventions. 146 - overview of GPIO (General Purpose Input/Output) access conventions.
161hayes-esp.txt
162 - info on using the Hayes ESP serial driver.
163highuid.txt 147highuid.txt
164 - notes on the change from 16 bit to 32 bit user/group IDs. 148 - notes on the change from 16 bit to 32 bit user/group IDs.
165timers/ 149timers/
@@ -186,8 +170,6 @@ io_ordering.txt
186 - info on ordering I/O writes to memory-mapped addresses. 170 - info on ordering I/O writes to memory-mapped addresses.
187ioctl/ 171ioctl/
188 - directory with documents describing various IOCTL calls. 172 - directory with documents describing various IOCTL calls.
189ioctl-number.txt
190 - how to implement and register device/driver ioctl calls.
191iostats.txt 173iostats.txt
192 - info on I/O statistics Linux kernel provides. 174 - info on I/O statistics Linux kernel provides.
193irqflags-tracing.txt 175irqflags-tracing.txt
@@ -250,14 +232,10 @@ mips/
250 - directory with info about Linux on MIPS architecture. 232 - directory with info about Linux on MIPS architecture.
251mono.txt 233mono.txt
252 - how to execute Mono-based .NET binaries with the help of BINFMT_MISC. 234 - how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
253moxa-smartio
254 - file with info on installing/using Moxa multiport serial driver.
255mutex-design.txt 235mutex-design.txt
256 - info on the generic mutex subsystem. 236 - info on the generic mutex subsystem.
257namespaces/ 237namespaces/
258 - directory with various information about namespaces 238 - directory with various information about namespaces
259nbd.txt
260 - info on a TCP implementation of a network block device.
261netlabel/ 239netlabel/
262 - directory with information on the NetLabel subsystem. 240 - directory with information on the NetLabel subsystem.
263networking/ 241networking/
@@ -270,8 +248,6 @@ numastat.txt
270 - info on how to read Numa policy hit/miss statistics in sysfs. 248 - info on how to read Numa policy hit/miss statistics in sysfs.
271oops-tracing.txt 249oops-tracing.txt
272 - how to decode those nasty internal kernel error dump messages. 250 - how to decode those nasty internal kernel error dump messages.
273paride.txt
274 - information about the parallel port IDE subsystem.
275parisc/ 251parisc/
276 - directory with info on using Linux on PA-RISC architecture. 252 - directory with info on using Linux on PA-RISC architecture.
277parport.txt 253parport.txt
@@ -294,18 +270,12 @@ printk-formats.txt
294 - how to get printk format specifiers right 270 - how to get printk format specifiers right
295prio_tree.txt 271prio_tree.txt
296 - info on radix-priority-search-tree use for indexing vmas. 272 - info on radix-priority-search-tree use for indexing vmas.
297ramdisk.txt
298 - short guide on how to set up and use the RAM disk.
299rbtree.txt 273rbtree.txt
300 - info on what red-black trees are and what they are for. 274 - info on what red-black trees are and what they are for.
301riscom8.txt
302 - notes on using the RISCom/8 multi-port serial driver.
303robust-futex-ABI.txt 275robust-futex-ABI.txt
304 - documentation of the robust futex ABI. 276 - documentation of the robust futex ABI.
305robust-futexes.txt 277robust-futexes.txt
306 - a description of what robust futexes are. 278 - a description of what robust futexes are.
307rocket.txt
308 - info on the Comtrol RocketPort multiport serial driver.
309rt-mutex-design.txt 279rt-mutex-design.txt
310 - description of the RealTime mutex implementation design. 280 - description of the RealTime mutex implementation design.
311rt-mutex.txt 281rt-mutex.txt
@@ -334,8 +304,6 @@ sparc/
334 - directory with info on using Linux on Sparc architecture. 304 - directory with info on using Linux on Sparc architecture.
335sparse.txt 305sparse.txt
336 - info on how to obtain and use the sparse tool for typechecking. 306 - info on how to obtain and use the sparse tool for typechecking.
337specialix.txt
338 - info on hardware/driver for specialix IO8+ multiport serial card.
339spi/ 307spi/
340 - overview of Linux kernel Serial Peripheral Interface (SPI) support. 308 - overview of Linux kernel Serial Peripheral Interface (SPI) support.
341spinlocks.txt 309spinlocks.txt
@@ -344,14 +312,10 @@ stable_api_nonsense.txt
344 - info on why the kernel does not have a stable in-kernel api or abi. 312 - info on why the kernel does not have a stable in-kernel api or abi.
345stable_kernel_rules.txt 313stable_kernel_rules.txt
346 - rules and procedures for the -stable kernel releases. 314 - rules and procedures for the -stable kernel releases.
347stallion.txt
348 - info on using the Stallion multiport serial driver.
349svga.txt 315svga.txt
350 - short guide on selecting video modes at boot via VGA BIOS. 316 - short guide on selecting video modes at boot via VGA BIOS.
351sysfs-rules.txt 317sysfs-rules.txt
352 - How not to use sysfs. 318 - How not to use sysfs.
353sx.txt
354 - info on the Specialix SX/SI multiport serial driver.
355sysctl/ 319sysctl/
356 - directory with info on the /proc/sys/* files. 320 - directory with info on the /proc/sys/* files.
357sysrq.txt 321sysrq.txt
@@ -360,8 +324,6 @@ telephony/
360 - directory with info on telephony (e.g. voice over IP) support. 324 - directory with info on telephony (e.g. voice over IP) support.
361time_interpolators.txt 325time_interpolators.txt
362 - info on time interpolators. 326 - info on time interpolators.
363tty.txt
364 - guide to the locking policies of the tty layer.
365uml/ 327uml/
366 - directory with information about User Mode Linux. 328 - directory with information about User Mode Linux.
367unicode.txt 329unicode.txt
diff --git a/Documentation/PCI/00-INDEX b/Documentation/PCI/00-INDEX
index 49f43946c6b6..812b17fe3ed0 100644
--- a/Documentation/PCI/00-INDEX
+++ b/Documentation/PCI/00-INDEX
@@ -1,5 +1,7 @@
100-INDEX 100-INDEX
2 - this file 2 - this file
3MSI-HOWTO.txt
4 - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
3PCI-DMA-mapping.txt 5PCI-DMA-mapping.txt
4 - info for PCI drivers using DMA portably across all platforms 6 - info for PCI drivers using DMA portably across all platforms
5PCIEBUS-HOWTO.txt 7PCIEBUS-HOWTO.txt
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt
index 256defd7e174..256defd7e174 100644
--- a/Documentation/MSI-HOWTO.txt
+++ b/Documentation/PCI/MSI-HOWTO.txt
diff --git a/Documentation/blockdev/00-INDEX b/Documentation/blockdev/00-INDEX
new file mode 100644
index 000000000000..86f054c47013
--- /dev/null
+++ b/Documentation/blockdev/00-INDEX
@@ -0,0 +1,16 @@
100-INDEX
2 - this file
3README.DAC960
4 - info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
5cciss.txt
6 - info, major/minor #'s for Compaq's SMART Array Controllers.
7cpqarray.txt
8 - info on using Compaq's SMART2 Intelligent Disk Array Controllers.
9floppy.txt
10 - notes and driver options for the floppy disk driver.
11nbd.txt
12 - info on a TCP implementation of a network block device.
13paride.txt
14 - information about the parallel port IDE subsystem.
15ramdisk.txt
16 - short guide on how to set up and use the RAM disk.
diff --git a/Documentation/README.DAC960 b/Documentation/blockdev/README.DAC960
index 0e8f618ab534..0e8f618ab534 100644
--- a/Documentation/README.DAC960
+++ b/Documentation/blockdev/README.DAC960
diff --git a/Documentation/cciss.txt b/Documentation/blockdev/cciss.txt
index 89698e8df7d4..89698e8df7d4 100644
--- a/Documentation/cciss.txt
+++ b/Documentation/blockdev/cciss.txt
diff --git a/Documentation/cpqarray.txt b/Documentation/blockdev/cpqarray.txt
index c7154e20ef5e..c7154e20ef5e 100644
--- a/Documentation/cpqarray.txt
+++ b/Documentation/blockdev/cpqarray.txt
diff --git a/Documentation/floppy.txt b/Documentation/blockdev/floppy.txt
index 6ccab88705cb..6ccab88705cb 100644
--- a/Documentation/floppy.txt
+++ b/Documentation/blockdev/floppy.txt
diff --git a/Documentation/nbd.txt b/Documentation/blockdev/nbd.txt
index aeb93ffe6416..aeb93ffe6416 100644
--- a/Documentation/nbd.txt
+++ b/Documentation/blockdev/nbd.txt
diff --git a/Documentation/paride.txt b/Documentation/blockdev/paride.txt
index e4312676bdda..e4312676bdda 100644
--- a/Documentation/paride.txt
+++ b/Documentation/blockdev/paride.txt
diff --git a/Documentation/ramdisk.txt b/Documentation/blockdev/ramdisk.txt
index 6c820baa19a6..6c820baa19a6 100644
--- a/Documentation/ramdisk.txt
+++ b/Documentation/blockdev/ramdisk.txt
diff --git a/Documentation/ioctl/00-INDEX b/Documentation/ioctl/00-INDEX
new file mode 100644
index 000000000000..d2fe4d4729ef
--- /dev/null
+++ b/Documentation/ioctl/00-INDEX
@@ -0,0 +1,10 @@
100-INDEX
2 - this file
3cdrom.txt
4 - summary of CDROM ioctl calls
5hdio.txt
6 - summary of HDIO_ ioctl calls
7ioctl-decoding.txt
8 - how to decode the bits of an IOCTL code
9ioctl-number.txt
10 - how to implement and register device/driver ioctl calls
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index b880ce5dbd33..b880ce5dbd33 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c600c4ffc657..9fa6508892c2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -629,7 +629,7 @@ and is between 256 and 4096 characters. It is defined in the file
629 629
630 digiepca= [HW,SERIAL] 630 digiepca= [HW,SERIAL]
631 See drivers/char/README.epca and 631 See drivers/char/README.epca and
632 Documentation/digiepca.txt. 632 Documentation/serial/digiepca.txt.
633 633
634 disable_mtrr_cleanup [X86] 634 disable_mtrr_cleanup [X86]
635 enable_mtrr_cleanup [X86] 635 enable_mtrr_cleanup [X86]
@@ -740,7 +740,7 @@ and is between 256 and 4096 characters. It is defined in the file
740 See header of drivers/scsi/fdomain.c. 740 See header of drivers/scsi/fdomain.c.
741 741
742 floppy= [HW] 742 floppy= [HW]
743 See Documentation/floppy.txt. 743 See Documentation/blockdev/floppy.txt.
744 744
745 force_pal_cache_flush 745 force_pal_cache_flush
746 [IA-64] Avoid check_sal_cache_flush which may hang on 746 [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
1101 the same attribute, the last one is used. 1101 the same attribute, the last one is used.
1102 1102
1103 load_ramdisk= [RAM] List of ramdisks to load from floppy 1103 load_ramdisk= [RAM] List of ramdisks to load from floppy
1104 See Documentation/ramdisk.txt. 1104 See Documentation/blockdev/ramdisk.txt.
1105 1105
1106 lockd.nlm_grace_period=P [NFS] Assign grace period. 1106 lockd.nlm_grace_period=P [NFS] Assign grace period.
1107 Format: <integer> 1107 Format: <integer>
@@ -1596,7 +1596,7 @@ and is between 256 and 4096 characters. It is defined in the file
1596 1596
1597 pcd. [PARIDE] 1597 pcd. [PARIDE]
1598 See header of drivers/block/paride/pcd.c. 1598 See header of drivers/block/paride/pcd.c.
1599 See also Documentation/paride.txt. 1599 See also Documentation/blockdev/paride.txt.
1600 1600
1601 pci=option[,option...] [PCI] various PCI subsystem options: 1601 pci=option[,option...] [PCI] various PCI subsystem options:
1602 off [X86] don't probe for the PCI bus 1602 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
1697 pcmv= [HW,PCMCIA] BadgePAD 4 1697 pcmv= [HW,PCMCIA] BadgePAD 4
1698 1698
1699 pd. [PARIDE] 1699 pd. [PARIDE]
1700 See Documentation/paride.txt. 1700 See Documentation/blockdev/paride.txt.
1701 1701
1702 pdcchassis= [PARISC,HW] Disable/Enable PDC Chassis Status codes at 1702 pdcchassis= [PARISC,HW] Disable/Enable PDC Chassis Status codes at
1703 boot time. 1703 boot time.
@@ -1705,10 +1705,10 @@ and is between 256 and 4096 characters. It is defined in the file
1705 See arch/parisc/kernel/pdc_chassis.c 1705 See arch/parisc/kernel/pdc_chassis.c
1706 1706
1707 pf. [PARIDE] 1707 pf. [PARIDE]
1708 See Documentation/paride.txt. 1708 See Documentation/blockdev/paride.txt.
1709 1709
1710 pg. [PARIDE] 1710 pg. [PARIDE]
1711 See Documentation/paride.txt. 1711 See Documentation/blockdev/paride.txt.
1712 1712
1713 pirq= [SMP,APIC] Manual mp-table setup 1713 pirq= [SMP,APIC] Manual mp-table setup
1714 See Documentation/x86/i386/IO-APIC.txt. 1714 See Documentation/x86/i386/IO-APIC.txt.
@@ -1778,7 +1778,7 @@ and is between 256 and 4096 characters. It is defined in the file
1778 1778
1779 prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk 1779 prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
1780 before loading. 1780 before loading.
1781 See Documentation/ramdisk.txt. 1781 See Documentation/blockdev/ramdisk.txt.
1782 1782
1783 psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to 1783 psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to
1784 probe for; one of (bare|imps|exps|lifebook|any). 1784 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
1798 <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq> 1798 <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
1799 1799
1800 pt. [PARIDE] 1800 pt. [PARIDE]
1801 See Documentation/paride.txt. 1801 See Documentation/blockdev/paride.txt.
1802 1802
1803 pty.legacy_count= 1803 pty.legacy_count=
1804 [KNL] Number of legacy pty's. Overwrites compiled-in 1804 [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
1812 See Documentation/md.txt. 1812 See Documentation/md.txt.
1813 1813
1814 ramdisk_blocksize= [RAM] 1814 ramdisk_blocksize= [RAM]
1815 See Documentation/ramdisk.txt. 1815 See Documentation/blockdev/ramdisk.txt.
1816 1816
1817 ramdisk_size= [RAM] Sizes of RAM disks in kilobytes 1817 ramdisk_size= [RAM] Sizes of RAM disks in kilobytes
1818 See Documentation/ramdisk.txt. 1818 See Documentation/blockdev/ramdisk.txt.
1819 1819
1820 rcupdate.blimit= [KNL,BOOT] 1820 rcupdate.blimit= [KNL,BOOT]
1821 Set maximum number of finished RCU callbacks to process 1821 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
2147 See Documentation/sonypi.txt 2147 See Documentation/sonypi.txt
2148 2148
2149 specialix= [HW,SERIAL] Specialix multi-serial port adapter 2149 specialix= [HW,SERIAL] Specialix multi-serial port adapter
2150 See Documentation/specialix.txt. 2150 See Documentation/serial/specialix.txt.
2151 2151
2152 spia_io_base= [HW,MTD] 2152 spia_io_base= [HW,MTD]
2153 spia_fio_base= 2153 spia_fio_base=
diff --git a/Documentation/serial/00-INDEX b/Documentation/serial/00-INDEX
new file mode 100644
index 000000000000..07dcdb0d2a36
--- /dev/null
+++ b/Documentation/serial/00-INDEX
@@ -0,0 +1,24 @@
100-INDEX
2 - this file.
3README.cycladesZ
4 - info on Cyclades-Z firmware loading.
5computone.txt
6 - info on Computone Intelliport II/Plus Multiport Serial Driver.
7digiepca.txt
8 - info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
9hayes-esp.txt
10 - info on using the Hayes ESP serial driver.
11moxa-smartio
12 - file with info on installing/using Moxa multiport serial driver.
13riscom8.txt
14 - notes on using the RISCom/8 multi-port serial driver.
15rocket.txt
16 - info on the Comtrol RocketPort multiport serial driver.
17specialix.txt
18 - info on hardware/driver for specialix IO8+ multiport serial card.
19stallion.txt
20 - info on using the Stallion multiport serial driver.
21sx.txt
22 - info on the Specialix SX/SI multiport serial driver.
23tty.txt
24 - guide to the locking policies of the tty layer.
diff --git a/Documentation/README.cycladesZ b/Documentation/serial/README.cycladesZ
index 024a69443cc2..024a69443cc2 100644
--- a/Documentation/README.cycladesZ
+++ b/Documentation/serial/README.cycladesZ
diff --git a/Documentation/computone.txt b/Documentation/serial/computone.txt
index 5e2a0c76bfa0..c57ea4781e5d 100644
--- a/Documentation/computone.txt
+++ b/Documentation/serial/computone.txt
@@ -247,7 +247,7 @@ shar archive to make it easier to extract the script from the documentation.
247To create the ip2mkdev shell script change to a convenient directory (/tmp 247To create the ip2mkdev shell script change to a convenient directory (/tmp
248works just fine) and run the following command: 248works just fine) and run the following command:
249 249
250 unshar Documentation/computone.txt 250 unshar Documentation/serial/computone.txt
251 (This file) 251 (This file)
252 252
253You should now have a file ip2mkdev in your current working directory with 253You should now have a file ip2mkdev in your current working directory with
diff --git a/Documentation/digiepca.txt b/Documentation/serial/digiepca.txt
index f2560e22f2c9..f2560e22f2c9 100644
--- a/Documentation/digiepca.txt
+++ b/Documentation/serial/digiepca.txt
diff --git a/Documentation/hayes-esp.txt b/Documentation/serial/hayes-esp.txt
index 09b5d5856758..09b5d5856758 100644
--- a/Documentation/hayes-esp.txt
+++ b/Documentation/serial/hayes-esp.txt
diff --git a/Documentation/moxa-smartio b/Documentation/serial/moxa-smartio
index 5337e80a5b96..5337e80a5b96 100644
--- a/Documentation/moxa-smartio
+++ b/Documentation/serial/moxa-smartio
diff --git a/Documentation/riscom8.txt b/Documentation/serial/riscom8.txt
index 14f61fdad7ca..14f61fdad7ca 100644
--- a/Documentation/riscom8.txt
+++ b/Documentation/serial/riscom8.txt
diff --git a/Documentation/rocket.txt b/Documentation/serial/rocket.txt
index 1d8582990435..1d8582990435 100644
--- a/Documentation/rocket.txt
+++ b/Documentation/serial/rocket.txt
diff --git a/Documentation/specialix.txt b/Documentation/serial/specialix.txt
index 6eb6f3a3331c..6eb6f3a3331c 100644
--- a/Documentation/specialix.txt
+++ b/Documentation/serial/specialix.txt
diff --git a/Documentation/stallion.txt b/Documentation/serial/stallion.txt
index 5c4902d9a5be..5c4902d9a5be 100644
--- a/Documentation/stallion.txt
+++ b/Documentation/serial/stallion.txt
diff --git a/Documentation/sx.txt b/Documentation/serial/sx.txt
index cb4efa0fb5cc..cb4efa0fb5cc 100644
--- a/Documentation/sx.txt
+++ b/Documentation/serial/sx.txt
diff --git a/Documentation/tty.txt b/Documentation/serial/tty.txt
index 8e65c4498c52..8e65c4498c52 100644
--- a/Documentation/tty.txt
+++ b/Documentation/serial/tty.txt
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 61ad8d639ba3..0344a8a8321d 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -21,7 +21,8 @@ config BLK_DEV_FD
21 ---help--- 21 ---help---
22 If you want to use the floppy disk drive(s) of your PC under Linux, 22 If you want to use the floppy disk drive(s) of your PC under Linux,
23 say Y. Information about this driver, especially important for IBM 23 say Y. Information about this driver, especially important for IBM
24 Thinkpad users, is contained in <file:Documentation/floppy.txt>. 24 Thinkpad users, is contained in
25 <file:Documentation/blockdev/floppy.txt>.
25 That file also contains the location of the Floppy driver FAQ as 26 That file also contains the location of the Floppy driver FAQ as
26 well as location of the fdutils package used to configure additional 27 well as location of the fdutils package used to configure additional
27 parameters of the driver at run time. 28 parameters of the driver at run time.
@@ -76,7 +77,7 @@ config PARIDE
76 your computer's parallel port. Most of them are actually IDE devices 77 your computer's parallel port. Most of them are actually IDE devices
77 using a parallel port IDE adapter. This option enables the PARIDE 78 using a parallel port IDE adapter. This option enables the PARIDE
78 subsystem which contains drivers for many of these external drives. 79 subsystem which contains drivers for many of these external drives.
79 Read <file:Documentation/paride.txt> for more information. 80 Read <file:Documentation/blockdev/paride.txt> for more information.
80 81
81 If you have said Y to the "Parallel-port support" configuration 82 If you have said Y to the "Parallel-port support" configuration
82 option, you may share a single port between your printer and other 83 option, you may share a single port between your printer and other
@@ -114,9 +115,9 @@ config BLK_CPQ_DA
114 help 115 help
115 This is the driver for Compaq Smart Array controllers. Everyone 116 This is the driver for Compaq Smart Array controllers. Everyone
116 using these boards should say Y here. See the file 117 using these boards should say Y here. See the file
117 <file:Documentation/cpqarray.txt> for the current list of boards 118 <file:Documentation/blockdev/cpqarray.txt> for the current list of
118 supported by this driver, and for further information on the use of 119 boards supported by this driver, and for further information on the
119 this driver. 120 use of this driver.
120 121
121config BLK_CPQ_CISS_DA 122config BLK_CPQ_CISS_DA
122 tristate "Compaq Smart Array 5xxx support" 123 tristate "Compaq Smart Array 5xxx support"
@@ -124,7 +125,7 @@ config BLK_CPQ_CISS_DA
124 help 125 help
125 This is the driver for Compaq Smart Array 5xxx controllers. 126 This is the driver for Compaq Smart Array 5xxx controllers.
126 Everyone using these boards should say Y here. 127 Everyone using these boards should say Y here.
127 See <file:Documentation/cciss.txt> for the current list of 128 See <file:Documentation/blockdev/cciss.txt> for the current list of
128 boards supported by this driver, and for further information 129 boards supported by this driver, and for further information
129 on the use of this driver. 130 on the use of this driver.
130 131
@@ -135,7 +136,7 @@ config CISS_SCSI_TAPE
135 help 136 help
136 When enabled (Y), this option allows SCSI tape drives and SCSI medium 137 When enabled (Y), this option allows SCSI tape drives and SCSI medium
137 changers (tape robots) to be accessed via a Compaq 5xxx array 138 changers (tape robots) to be accessed via a Compaq 5xxx array
138 controller. (See <file:Documentation/cciss.txt> for more details.) 139 controller. (See <file:Documentation/blockdev/cciss.txt> for more details.)
139 140
140 "SCSI support" and "SCSI tape support" must also be enabled for this 141 "SCSI support" and "SCSI tape support" must also be enabled for this
141 option to work. 142 option to work.
@@ -149,8 +150,8 @@ config BLK_DEV_DAC960
149 help 150 help
150 This driver adds support for the Mylex DAC960, AcceleRAID, and 151 This driver adds support for the Mylex DAC960, AcceleRAID, and
151 eXtremeRAID PCI RAID controllers. See the file 152 eXtremeRAID PCI RAID controllers. See the file
152 <file:Documentation/README.DAC960> for further information about 153 <file:Documentation/blockdev/README.DAC960> for further information
153 this driver. 154 about this driver.
154 155
155 To compile this driver as a module, choose M here: the 156 To compile this driver as a module, choose M here: the
156 module will be called DAC960. 157 module will be called DAC960.
@@ -278,9 +279,9 @@ config BLK_DEV_NBD
278 userland (making server and client physically the same computer, 279 userland (making server and client physically the same computer,
279 communicating using the loopback network device). 280 communicating using the loopback network device).
280 281
281 Read <file:Documentation/nbd.txt> for more information, especially 282 Read <file:Documentation/blockdev/nbd.txt> for more information,
282 about where to find the server code, which runs in user space and 283 especially about where to find the server code, which runs in user
283 does not need special kernel support. 284 space and does not need special kernel support.
284 285
285 Note that this has nothing to do with the network file systems NFS 286 Note that this has nothing to do with the network file systems NFS
286 or Coda; you can say N here even if you intend to use NFS or Coda. 287 or Coda; you can say N here even if you intend to use NFS or Coda.
@@ -321,8 +322,8 @@ config BLK_DEV_RAM
321 store a copy of a minimal root file system off of a floppy into RAM 322 store a copy of a minimal root file system off of a floppy into RAM
322 during the initial install of Linux. 323 during the initial install of Linux.
323 324
324 Note that the kernel command line option "ramdisk=XX" is now 325 Note that the kernel command line option "ramdisk=XX" is now obsolete.
325 obsolete. For details, read <file:Documentation/ramdisk.txt>. 326 For details, read <file:Documentation/blockdev/ramdisk.txt>.
326 327
327 To compile this driver as a module, choose M here: the 328 To compile this driver as a module, choose M here: the
328 module will be called rd. 329 module will be called rd.
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 14db747a636e..cf29cc4e6ab7 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4124,7 +4124,7 @@ static int __init floppy_setup(char *str)
4124 printk("\n"); 4124 printk("\n");
4125 } else 4125 } else
4126 DPRINT("botched floppy option\n"); 4126 DPRINT("botched floppy option\n");
4127 DPRINT("Read Documentation/floppy.txt\n"); 4127 DPRINT("Read Documentation/blockdev/floppy.txt\n");
4128 return 0; 4128 return 0;
4129} 4129}
4130 4130
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43b35d0369d6..43d6ba83a191 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -124,7 +124,7 @@ config COMPUTONE
124 which give you many serial ports. You would need something like this 124 which give you many serial ports. You would need something like this
125 to connect more than two modems to your Linux box, for instance in 125 to connect more than two modems to your Linux box, for instance in
126 order to become a dial-in server. If you have a card like that, say 126 order to become a dial-in server. If you have a card like that, say
127 Y here and read <file:Documentation/computone.txt>. 127 Y here and read <file:Documentation/serial/computone.txt>.
128 128
129 To compile this driver as module, choose M here: the 129 To compile this driver as module, choose M here: the
130 module will be called ip2. 130 module will be called ip2.
@@ -136,7 +136,7 @@ config ROCKETPORT
136 This driver supports Comtrol RocketPort and RocketModem PCI boards. 136 This driver supports Comtrol RocketPort and RocketModem PCI boards.
137 These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or 137 These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
138 modems. For information about the RocketPort/RocketModem boards 138 modems. For information about the RocketPort/RocketModem boards
139 and this driver read <file:Documentation/rocket.txt>. 139 and this driver read <file:Documentation/serial/rocket.txt>.
140 140
141 To compile this driver as a module, choose M here: the 141 To compile this driver as a module, choose M here: the
142 module will be called rocket. 142 module will be called rocket.
@@ -154,7 +154,7 @@ config CYCLADES
154 your Linux box, for instance in order to become a dial-in server. 154 your Linux box, for instance in order to become a dial-in server.
155 155
156 For information about the Cyclades-Z card, read 156 For information about the Cyclades-Z card, read
157 <file:Documentation/README.cycladesZ>. 157 <file:Documentation/serial/README.cycladesZ>.
158 158
159 To compile this driver as a module, choose M here: the 159 To compile this driver as a module, choose M here: the
160 module will be called cyclades. 160 module will be called cyclades.
@@ -183,7 +183,7 @@ config DIGIEPCA
183 box, for instance in order to become a dial-in server. This driver 183 box, for instance in order to become a dial-in server. This driver
184 supports the original PC (ISA) boards as well as PCI, and EISA. If 184 supports the original PC (ISA) boards as well as PCI, and EISA. If
185 you have a card like this, say Y here and read the file 185 you have a card like this, say Y here and read the file
186 <file:Documentation/digiepca.txt>. 186 <file:Documentation/serial/digiepca.txt>.
187 187
188 To compile this driver as a module, choose M here: the 188 To compile this driver as a module, choose M here: the
189 module will be called epca. 189 module will be called epca.
@@ -289,7 +289,7 @@ config RISCOM8
289 which gives you many serial ports. You would need something like 289 which gives you many serial ports. You would need something like
290 this to connect more than two modems to your Linux box, for instance 290 this to connect more than two modems to your Linux box, for instance
291 in order to become a dial-in server. If you have a card like that, 291 in order to become a dial-in server. If you have a card like that,
292 say Y here and read the file <file:Documentation/riscom8.txt>. 292 say Y here and read the file <file:Documentation/serial/riscom8.txt>.
293 293
294 Also it's possible to say M here and compile this driver as kernel 294 Also it's possible to say M here and compile this driver as kernel
295 loadable module; the module will be called riscom8. 295 loadable module; the module will be called riscom8.
@@ -304,8 +304,8 @@ config SPECIALIX
304 your Linux box, for instance in order to become a dial-in server. 304 your Linux box, for instance in order to become a dial-in server.
305 305
306 If you have a card like that, say Y here and read the file 306 If you have a card like that, say Y here and read the file
307 <file:Documentation/specialix.txt>. Also it's possible to say M here 307 <file:Documentation/serial/specialix.txt>. Also it's possible to say
308 and compile this driver as kernel loadable module which will be 308 M here and compile this driver as kernel loadable module which will be
309 called specialix. 309 called specialix.
310 310
311config SX 311config SX
@@ -313,7 +313,7 @@ config SX
313 depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) 313 depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
314 help 314 help
315 This is a driver for the SX and SI multiport serial cards. 315 This is a driver for the SX and SI multiport serial cards.
316 Please read the file <file:Documentation/sx.txt> for details. 316 Please read the file <file:Documentation/serial/sx.txt> for details.
317 317
318 This driver can only be built as a module ( = code which can be 318 This driver can only be built as a module ( = code which can be
319 inserted in and removed from the running kernel whenever you want). 319 inserted in and removed from the running kernel whenever you want).
@@ -344,8 +344,8 @@ config STALDRV
344 like this to connect more than two modems to your Linux box, for 344 like this to connect more than two modems to your Linux box, for
345 instance in order to become a dial-in server. If you say Y here, 345 instance in order to become a dial-in server. If you say Y here,
346 you will be asked for your specific card model in the next 346 you will be asked for your specific card model in the next
347 questions. Make sure to read <file:Documentation/stallion.txt> in 347 questions. Make sure to read <file:Documentation/serial/stallion.txt>
348 this case. If you have never heard about all this, it's safe to 348 in this case. If you have never heard about all this, it's safe to
349 say N. 349 say N.
350 350
351config STALLION 351config STALLION
@@ -354,7 +354,7 @@ config STALLION
354 help 354 help
355 If you have an EasyIO or EasyConnection 8/32 multiport Stallion 355 If you have an EasyIO or EasyConnection 8/32 multiport Stallion
356 card, then this is for you; say Y. Make sure to read 356 card, then this is for you; say Y. Make sure to read
357 <file:Documentation/stallion.txt>. 357 <file:Documentation/serial/stallion.txt>.
358 358
359 To compile this driver as a module, choose M here: the 359 To compile this driver as a module, choose M here: the
360 module will be called stallion. 360 module will be called stallion.
@@ -365,7 +365,7 @@ config ISTALLION
365 help 365 help
366 If you have an EasyConnection 8/64, ONboard, Brumby or Stallion 366 If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
367 serial multiport card, say Y here. Make sure to read 367 serial multiport card, say Y here. Make sure to read
368 <file:Documentation/stallion.txt>. 368 <file:Documentation/serial/stallion.txt>.
369 369
370 To compile this driver as a module, choose M here: the 370 To compile this driver as a module, choose M here: the
371 module will be called istallion. 371 module will be called istallion.
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 242fd46fda22..a16b94f12eb2 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -72,7 +72,7 @@
72/* 72/*
73 * There is a bunch of documentation about the card, jumpers, config 73 * There is a bunch of documentation about the card, jumpers, config
74 * settings, restrictions, cables, device names and numbers in 74 * settings, restrictions, cables, device names and numbers in
75 * Documentation/specialix.txt 75 * Documentation/serial/specialix.txt
76 */ 76 */
77 77
78#include <linux/module.h> 78#include <linux/module.h>