diff options
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 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 | ||
116 | config SOUND_AU1550_AC97 | 116 | config 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 | ||
120 | config SOUND_TRIDENT | 121 | config 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 | ||
1896 | MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); | 1896 | MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); |
1897 | MODULE_DESCRIPTION("Au1550 AC97 Audio Driver"); | 1897 | MODULE_DESCRIPTION("Au1550 AC97 Audio Driver"); |
1898 | MODULE_LICENSE("GPL"); | ||
1899 | |||
1898 | 1900 | ||
1899 | static int __devinit | 1901 | static int __devinit |
1900 | au1550_probe(void) | 1902 | au1550_probe(void) |