This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / Documentation / floppy.txt

diff --git a/Documentation/floppy.txt b/Documentation/floppy.txt
index 6fb10fc..99d3ad3 100644 (file)
--- a/Documentation/floppy.txt
+++ b/Documentation/floppy.txt
@@ -13,20 +13,15 @@ LILO configuration options (Thinkpad users, read this)
  The floppy driver is configured using the 'floppy=' option in
 lilo. This option can be typed at the boot prompt, or entered in the
 lilo configuration file.
-
- Example: If your kernel is called linux-2.6.9, type the following line
+ Example: If your kernel is called linux-2.2.13, type the following line
 at the lilo boot prompt (if you have a thinkpad):
-
- linux-2.6.9 floppy=thinkpad
-
+ linux-2.2.13 floppy=thinkpad
 You may also enter the following line in /etc/lilo.conf, in the description
-of linux-2.6.9:
-
+of linux-2.2.13:
  append = "floppy=thinkpad"
 
  Several floppy related options may be given, example:
-
- linux-2.6.9 floppy=daring floppy=two_fdc
+ linux-2.2.13 floppy=daring floppy=two_fdc
  append = "floppy=daring floppy=two_fdc"
 
  If you give options both in the lilo config file and on the boot
@@ -34,25 +29,17 @@ prompt, the option strings of both places are concatenated, the boot
 prompt options coming last. That's why there are also options to
 restore the default behavior.
 
-
-Module configuration options
-============================
-
  If you use the floppy driver as a module, use the following syntax:
-modprobe floppy <options>
+ insmod floppy <options>
 
 Example:
- modprobe floppy omnibook messages
-
- If you need certain options enabled every time you load the floppy driver,
-you can put:
-
- options floppy omnibook messages
-
-in /etc/modprobe.conf.
+ insmod floppy daring two_fdc
 
+ Some versions of insmod are buggy in one way or another. If you have
+any problems (options not being passed correctly, segfaults during
+insmod), first check whether there is a more recent version.
 
- The floppy driver related options are:
+ The floppy related options include:
 
  floppy=asus_pci
        Sets the bit mask to allow only units 0 and 1. (default)
@@ -112,7 +99,7 @@ in /etc/modprobe.conf.
        master arbitration error" messages from your Ethernet card (or
        from other devices) while accessing the floppy.
 
- floppy=usefifo
+ floppy=fifo
        Enables the FIFO. (default)
 
  floppy=<threshold>,fifo_depth
@@ -123,7 +110,6 @@ in /etc/modprobe.conf.
        lower, the interrupt latency should be lower too (faster
        processor). The benefit of a lower threshold is less
        interrupts.
-
        To tune the fifo threshold, switch on over/underrun messages
        using 'floppycontrol --messages'. Then access a floppy
        disk. If you get a huge amount of "Over/Underrun - retrying"
@@ -134,7 +120,6 @@ in /etc/modprobe.conf.
        fifo values without rebooting the machine for each test. Note
        that you need to do 'floppycontrol --messages' every time you
        re-insert the module.
-
        Usually, tuning the fifo threshold should not be needed, as
        the default (0xa) is reasonable.
 
@@ -143,7 +128,6 @@ in /etc/modprobe.conf.
        you have more than two floppy drives (only two can be
        described in the physical CMOS), or if your BIOS uses
        non-standard CMOS types. The CMOS types are:
-
                0 - Use the value of the physical CMOS
                1 - 5 1/4 DD
                2 - 5 1/4 HD
@@ -152,7 +136,6 @@ in /etc/modprobe.conf.
                5 - 3 1/2 ED
                6 - 3 1/2 ED
               16 - unknown or not installed
-
        (Note: there are two valid types for ED drives. This is because 5 was
        initially chosen to represent floppy *tapes*, and 6 for ED drives.
        AMI ignored this, and used 5 for ED drives. That's why the floppy
@@ -205,6 +188,7 @@ in /etc/modprobe.conf.
           in some more extreme cases."
 
 
+
 Supporting utilities and additional documentation:
 ==================================================
 
@@ -235,11 +219,3 @@ sure to mention also the type of the filesystem in the subject line.
  Be sure to read the FAQ before mailing/posting any bug reports!
 
  Alain
-
-Changelog
-=========
-
-10-30-2004 :   Cleanup, updating, add reference to module configuration.
-               James Nelson <james4765@gmail.com>
-
-6-3-2000 :     Original Document