Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bb12b76e2d795431fa9fd306eb274c69e5054dc7

Authored by Domen Puncer
Committed by Linus Torvalds
1 parent 7d46972277
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] au1xxx: oss sound support for au1200 

au1550 ac97 driver works fine on au1200 too.

Comments at the top of file state this code is GPL, so lets
mark it as GPL too.

Signed-off-by: Domen Puncer <domen.puncer@ultra.si>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 5 additions and 2 deletions Side-by-side Diff

... ... @@ -114,8 +114,9 @@
114 114 with the AC97 codec.
115 115  
116 116 config SOUND_AU1550_AC97
117   - tristate "Au1550 AC97 Sound"
118   - depends on SOUND_PRIME && SOC_AU1550
  117 + tristate "Au1550/Au1200 AC97 Sound"
  118 + select SND_AC97_CODEC
  119 + depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200)
119 120  
120 121 config SOUND_TRIDENT
121 122 tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
sound/oss/au1550_ac97.c
Diff comments   View file @ bb12b76
... ... @@ -1895,6 +1895,8 @@
1895 1895  
1896 1896 MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
1897 1897 MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");
  1898 +MODULE_LICENSE("GPL");
  1899 +
1898 1900  
1899 1901 static int __devinit
1900 1902 au1550_probe(void)