From 4761d14855dce5255d857fe9c6eb41cc843b5b7b Mon Sep 17 00:00:00 2001 From: Domen Puncer Date: Sun, 25 Jun 2006 05:49:29 -0700 Subject: [PATCH] --- yaml --- r: 29826 b: refs/heads/master c: bb12b76e2d795431fa9fd306eb274c69e5054dc7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/oss/Kconfig | 5 +++-- trunk/sound/oss/au1550_ac97.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f864d4222982..7a3bb0e65e1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d469722779c9fe0b415163e8fe837440f9c70dc +refs/heads/master: bb12b76e2d795431fa9fd306eb274c69e5054dc7 diff --git a/trunk/sound/oss/Kconfig b/trunk/sound/oss/Kconfig index 080ab036b67a..95754e2f71b8 100644 --- a/trunk/sound/oss/Kconfig +++ b/trunk/sound/oss/Kconfig @@ -114,8 +114,9 @@ config SOUND_VRC5477 with the AC97 codec. config SOUND_AU1550_AC97 - tristate "Au1550 AC97 Sound" - depends on SOUND_PRIME && SOC_AU1550 + tristate "Au1550/Au1200 AC97 Sound" + select SND_AC97_CODEC + depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200) config SOUND_TRIDENT tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" diff --git a/trunk/sound/oss/au1550_ac97.c b/trunk/sound/oss/au1550_ac97.c index 2e009427d633..4cdb86252d67 100644 --- a/trunk/sound/oss/au1550_ac97.c +++ b/trunk/sound/oss/au1550_ac97.c @@ -1895,6 +1895,8 @@ static /*const */ struct file_operations au1550_audio_fops = { MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); MODULE_DESCRIPTION("Au1550 AC97 Audio Driver"); +MODULE_LICENSE("GPL"); + static int __devinit au1550_probe(void)