diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-18 11:06:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-18 11:06:41 +0100 |
| commit | c0554f102e428b8d8de3bd006a7aa77d9a3ff930 (patch) | |
| tree | e954687b6b12eaae5e9ee7959e4e1fa059a59e63 | |
| parent | a3aaebc4b006e9405cddd553d8a75a531e6f01a8 (diff) | |
| parent | cd9f8e64c232eeb1247950007ee95de00b89ba7a (diff) | |
Merge branch 'topic/oss-cleanup' into for-linus
| -rw-r--r-- | Documentation/kernel-parameters.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8511d3532c2..d8362cf9909 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. |