The patch titled
au1xxx: oss sound support for au1200
has been added to the -mm tree. Its filename is
au1xxx-oss-sound-support-for-au1200.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: au1xxx: oss sound support for au1200
From: Domen Puncer <domen.puncer@xxxxxxxx>
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@xxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/oss/Kconfig | 5 +++--
sound/oss/au1550_ac97.c | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff -puN sound/oss/au1550_ac97.c~au1xxx-oss-sound-support-for-au1200 sound/oss/au1550_ac97.c
--- a/sound/oss/au1550_ac97.c~au1xxx-oss-sound-support-for-au1200
+++ a/sound/oss/au1550_ac97.c
@@ -1895,6 +1895,8 @@ static /*const */ struct file_operations
MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@xxxxxxxxxxxxxxxx");
MODULE_DESCRIPTION("Au1550 AC97 Audio Driver");
+MODULE_LICENSE("GPL");
+
static int __devinit
au1550_probe(void)
diff -puN sound/oss/Kconfig~au1xxx-oss-sound-support-for-au1200 sound/oss/Kconfig
--- a/sound/oss/Kconfig~au1xxx-oss-sound-support-for-au1200
+++ a/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"
_
Patches currently in -mm which might be from domen.puncer@xxxxxxxx are
au1550_ac97-spin_unlock-in-error-path.patch
au1xxx-oss-sound-support-for-au1200.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
