Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0554f10 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/oss-cleanup' into for-linus

parents a3aaebc4 cd9f8e64
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -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.