Merge branch 'topic/quirk-cleanup' into topic/misc

1 files changed, 0 insertions, 7 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8511d3532c27..d8362cf9909e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         a memory unit (amount[KMG]). See also
                         Documentation/kdump/kdump.txt for a example.
 
-        cs4232=         [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
-
         cs89x0_dma=     [HW,NET]
                         Format: <dma>
 
@@ -732,10 +729,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.
 
-        es1371=         [HW,OSS]
-                        Format: <spdif>,[<nomix>,[<amplifier>]]
-                        See also header of sound/oss/es1371.c.
-
         ether=          [HW,NET] Ethernet cards parameters
                         This option is obsoleted by the "netdev=" option, which
                         has equivalent usage. See its documentation for details.