Merge branch 'topic/oss-cleanup' into for-linus
This commit is contained in:
commit
c0554f102e
|
@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
a memory unit (amount[KMG]). See also
|
a memory unit (amount[KMG]). See also
|
||||||
Documentation/kdump/kdump.txt for a example.
|
Documentation/kdump/kdump.txt for a example.
|
||||||
|
|
||||||
cs4232= [HW,OSS]
|
|
||||||
Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>
|
|
||||||
|
|
||||||
cs89x0_dma= [HW,NET]
|
cs89x0_dma= [HW,NET]
|
||||||
Format: <dma>
|
Format: <dma>
|
||||||
|
|
||||||
|
@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
Default value is 0.
|
Default value is 0.
|
||||||
Value can be changed at runtime via /selinux/enforce.
|
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
|
ether= [HW,NET] Ethernet cards parameters
|
||||||
This option is obsoleted by the "netdev=" option, which
|
This option is obsoleted by the "netdev=" option, which
|
||||||
has equivalent usage. See its documentation for details.
|
has equivalent usage. See its documentation for details.
|
||||||
|
|
Loading…
Reference in New Issue