diff options
| author | Domen Puncer <domen.puncer@ultra.si> | 2006-06-25 05:49:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:25 -0700 |
| commit | bb12b76e2d795431fa9fd306eb274c69e5054dc7 (patch) | |
| tree | 8c10f43c9c0126e6551ccb1cba8f3900f9eb0686 /sound/oss | |
| parent | 7d469722779c9fe0b415163e8fe837440f9c70dc (diff) | |
| download | kernel_samsung_aries-bb12b76e2d795431fa9fd306eb274c69e5054dc7.zip kernel_samsung_aries-bb12b76e2d795431fa9fd306eb274c69e5054dc7.tar.gz kernel_samsung_aries-bb12b76e2d795431fa9fd306eb274c69e5054dc7.tar.bz2 | |
[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/Kconfig | 5 | ||||
| -rw-r--r-- | sound/oss/au1550_ac97.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index 080ab03..95754e2 100644 --- a/sound/oss/Kconfig +++ b/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/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 2e00942..4cdb862 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 = { MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); MODULE_DESCRIPTION("Au1550 AC97 Audio Driver"); +MODULE_LICENSE("GPL"); + static int __devinit au1550_probe(void) |