aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorDomen Puncer <domen.puncer@ultra.si>2006-06-25 08:49:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:25 -0400
commitbb12b76e2d795431fa9fd306eb274c69e5054dc7 (patch)
tree8c10f43c9c0126e6551ccb1cba8f3900f9eb0686 /sound/oss
parent7d469722779c9fe0b415163e8fe837440f9c70dc (diff)
[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>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/Kconfig5
-rw-r--r--sound/oss/au1550_ac97.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 080ab036b67a..95754e2f71b8 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -114,8 +114,9 @@ config SOUND_VRC5477
114 with the AC97 codec. 114 with the AC97 codec.
115 115
116config SOUND_AU1550_AC97 116config SOUND_AU1550_AC97
117 tristate "Au1550 AC97 Sound" 117 tristate "Au1550/Au1200 AC97 Sound"
118 depends on SOUND_PRIME && SOC_AU1550 118 select SND_AC97_CODEC
119 depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200)
119 120
120config SOUND_TRIDENT 121config SOUND_TRIDENT
121 tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" 122 tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 2e009427d633..4cdb86252d67 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -1895,6 +1895,8 @@ static /*const */ struct file_operations au1550_audio_fops = {
1895 1895
1896MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); 1896MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
1897MODULE_DESCRIPTION("Au1550 AC97 Audio Driver"); 1897MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");
1898MODULE_LICENSE("GPL");
1899
1898 1900
1899static int __devinit 1901static int __devinit
1900au1550_probe(void) 1902au1550_probe(void)