1 files changed, 5 insertions, 34 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 137e993f4329..ff571f9298e0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -289,9 +289,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         autotest        [IA64]
 
-        awe=            [HW,OSS] AWE32/SB32/AWE64 wave table synth
-                        Format: <io>,<memsize>,<isapnp>
-
         aztcd=          [HW,CD] Aztech CD268 CDROM driver
                         Format: <io>,0x79 (?)
 
@@ -355,9 +352,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
         clock=          [BUGS=IA-32, HW] gettimeofday clocksource override.
                         [Deprecated]
-                        Forces specified clocksource (if avaliable) to be used
+                        Forces specified clocksource (if available) to be used
                         when calculating gettimeofday(). If specified
-                        clocksource is not avalible, it defaults to PIT.
+                        clocksource is not available, it defaults to PIT.
                         Format: { pit | tsc | cyclone | pmtmr }
 
         disable_8254_timer
@@ -536,10 +533,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         Default value is 0.
                         Value can be changed at runtime via /selinux/enforce.
 
-        es1370=         [HW,OSS]
-                        Format: <lineout>[,<micbias>]
-                        See also header of sound/oss/es1370.c.
-
         es1371=         [HW,OSS]
                         Format: <spdif>,[<nomix>,[<amplifier>]]
                         See also header of sound/oss/es1371.c.
@@ -580,9 +573,6 @@ and is between 256 and 4096 characters. It is defined in the file
         gscd=           [HW,CD]
                         Format: <io>
 
-        gus=            [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma16>
-
         gvp11=          [HW,SCSI]
 
         hashdist=       [KNL,NUMA] Large hashes allocated during boot
@@ -611,8 +601,8 @@ and is between 256 and 4096 characters. It is defined in the file
         noirqbalance    [IA-32,SMP,KNL] Disable kernel irq balancing
 
         i8042.direct    [HW] Put keyboard port into non-translated mode
-        i8042.dumbkbd   [HW] Pretend that controlled can only read data from
-                             keyboard and can not control its state
+        i8042.dumbkbd   [HW] Pretend that controller can only read data from
+                             keyboard and cannot control its state
                              (Don't attempt to blink the leds)
         i8042.noaux     [HW] Don't check for auxiliary (== mouse) port
         i8042.nokbd     [HW] Don't check/create keyboard port
@@ -841,12 +831,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         (machvec) in a generic kernel.
                         Example: machvec=hpzx1_swiotlb
 
-        mad16=          [HW,OSS] Format:
-                        <io>,<irq>,<dma>,<dma16>,<mpu_io>,<mpu_irq>,<joystick>
-
-        maui=           [HW,OSS]
-                        Format: <io>,<irq>
-
         max_loop=       [LOOP] Maximum number of loopback devices that can
                         be mounted
                         Format: <1-256>
@@ -1114,9 +1098,6 @@ and is between 256 and 4096 characters. It is defined in the file
         opl3=           [HW,OSS]
                         Format: <io>
 
-        opl3sa=         [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma2>,<mpu_io>,<mpu_irq>
-
         opl3sa2=        [HW,OSS] Format:
                         <io>,<irq>,<dma>,<dma2>,<mss_io>,<mpu_io>,<ymode>,<loopback>[,<isapnp>,<multiple]
 
@@ -1357,10 +1338,6 @@ and is between 256 and 4096 characters. It is defined in the file
         rcu.qlowmark=   [KNL,BOOT] Set threshold of queued
                         RCU callbacks below which batch limiting is re-enabled.
 
-        rcu.rsinterval= [KNL,BOOT,SMP] Set the number of additional
-                        RCU callbacks to queued before forcing reschedule
-                        on all cpus.
-
         rdinit=         [KNL]
                         Format: <full_path>
                         Run specified binary instead of /init from the ramdisk,
@@ -1368,7 +1345,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         reboot=         [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
                         Format: <reboot_mode>[,<reboot_mode2>[,...]]
-                        See arch/*/kernel/reboot.c.
+                        See arch/*/kernel/reboot.c or arch/*/kernel/process.c                   
 
         reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
 
@@ -1455,9 +1432,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         sg_def_reserved_size=   [SCSI]
 
-        sgalaxy=        [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma2>,<sgbase>
-
         shapers=        [NET]
                         Maximal number of shapers.
 
@@ -1598,9 +1572,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
         snd-ymfpci=     [HW,ALSA]
 
-        sonicvibes=     [HW,OSS]
-                        Format: <reverb>
-
         sonycd535=      [HW,CD]
                         Format: <io>[,<irq>]