Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt
index 789f97ac22bf086c2b9320bb9db5fb3753d7df78..8363ad3ba0187f9abc65ab75c989e80bd0e70eed 100644 (file)
@@ -34,7 +34,6 @@ parameter is applicable:
        APIC    APIC support is enabled.
        APM     Advanced Power Management support is enabled.
        AX25    Appropriate AX.25 support is enabled.
-       CD      Appropriate CD support is enabled.
        DRM     Direct Rendering Management support is enabled.
        EDD     BIOS Enhanced Disk Drive Services (EDD) is enabled
        EFI     EFI Partitioning (GPT) is enabled
@@ -319,9 +318,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        autotest        [IA64]
 
-       aztcd=          [HW,CD] Aztech CD268 CDROM driver
-                       Format: <io>,0x79 (?)
-
        baycom_epp=     [HW,AX25]
                        Format: <io>,<mode>
 
@@ -364,10 +360,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        possible to determine what the correct size should be.
                        This option provides an override for these situations.
 
-       cdu31a=         [HW,CD]
-                       Format: <io>,<irq>[,PAS]
-                       See header of drivers/cdrom/cdu31a.c.
-
        chandev=        [HW,NET] Generic channel device initialisation
 
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
@@ -421,9 +413,6 @@ and is between 256 and 4096 characters. It is defined in the file
        hpet=           [IA-32,HPET] option to disable HPET and use PIT.
                        Format: disable
 
-       cm206=          [HW,CD]
-                       Format: { auto | [<io>,][<irq>] }
-
        com20020=       [HW,NET] ARCnet - COM20020 chipset
                        Format:
                        <io>[,<irq>[,<nodeID>[,<backplane>[,<ckp>[,<timeout>]]]]]
@@ -660,9 +649,6 @@ and is between 256 and 4096 characters. It is defined in the file
        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT.
 
-       gscd=           [HW,CD]
-                       Format: <io>
-
        gvp11=          [HW,SCSI]
 
        hashdist=       [KNL,NUMA] Large hashes allocated during boot
@@ -826,9 +812,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        tasks in the system -- can cause problems and
                        suboptimal load balancer performance.
 
-       isp16=          [HW,CD]
-                       Format: <io>,<irq>,<dma>,<setup>
-
        iucv=           [HW,NET]
 
        js=             [HW,JOY] Analog joystick
@@ -967,11 +950,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        mcatest=        [IA-64]
 
-       mcd=            [HW,CD]
-                       Format: <port>,<irq>,<mitsumi_bug_93_wait>
-
-       mcdx=           [HW,CD]
-
        mce             [IA-32] Machine Check Exception
 
        md=             [HW] RAID subsystems devices and level
@@ -1204,9 +1182,6 @@ and is between 256 and 4096 characters. It is defined in the file
        oprofile.timer= [HW]
                        Use timer interrupt instead of performance counters
 
-       optcd=          [HW,CD]
-                       Format: <io>
-
        osst=           [HW,SCSI] SCSI Tape Driver
                        Format: <buffer_size>,<write_threshold>
                        See also Documentation/scsi/st.txt.
@@ -1522,11 +1497,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        sbni=           [NET] Granch SBNI12 leased line adapter
 
-       sbpcd=          [HW,CD] Soundblaster CD adapter
-                       Format: <io>,<type>
-                       See a comment before function sbpcd_setup() in
-                       drivers/cdrom/sbpcd.c.
-
        sc1200wdt=      [HW,WDT] SC1200 WDT (watchdog) driver
                        Format: <io>[,<timeout>[,<isapnp>]]
 
@@ -1579,10 +1549,6 @@ and is between 256 and 4096 characters. It is defined in the file
        simeth=         [IA-64]
        simscsi=
 
-       sjcd=           [HW,CD]
-                       Format: <io>,<irq>,<dma>
-                       See header of drivers/cdrom/sjcd.c.
-
        slram=          [HW,MTD]
 
        slub_debug[=options[,slabs]]    [MM, SLUB]
@@ -1759,9 +1725,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
        snd-ymfpci=     [HW,ALSA]
 
-       sonycd535=      [HW,CD]
-                       Format: <io>[,<irq>]
-
        sonypi.*=       [HW] Sony Programmable I/O Control Device driver
                        See Documentation/sonypi.txt