diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:20 +0100 |
| commit | d7b6df5d1af11544401ca051aaf68b6e7f110c0e (patch) | |
| tree | 9c155be7d0ad77115a10094ab2d71b88efee6ca3 /sound/ppc/Kconfig | |
| parent | 7df4f694356a125e4553ca35b215fd9e88e858c5 (diff) | |
| parent | 39661758631da37efbc961e57a4ddefad573cc52 (diff) | |
| download | linux-3.10-d7b6df5d1af11544401ca051aaf68b6e7f110c0e.tar.gz linux-3.10-d7b6df5d1af11544401ca051aaf68b6e7f110c0e.tar.bz2 linux-3.10-d7b6df5d1af11544401ca051aaf68b6e7f110c0e.zip | |
Merge branch 'topic/powermac' into for-linus
Diffstat (limited to 'sound/ppc/Kconfig')
| -rw-r--r-- | sound/ppc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig index 777de2b1717..bd2338ab2ce 100644 --- a/sound/ppc/Kconfig +++ b/sound/ppc/Kconfig @@ -13,6 +13,7 @@ config SND_POWERMAC tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" depends on I2C && INPUT && PPC_PMAC select SND_PCM + select SND_VMASTER help Say Y here to include support for the integrated sound device. |