Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35

[pandora-kernel.git] / sound / aoa / Kconfig

diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig
index 5d5813c..c081e18 100644 (file)
--- a/sound/aoa/Kconfig
+++ b/sound/aoa/Kconfig
@@ -1,18 +1,17 @@
-menu "Apple Onboard Audio driver"
-       depends on SND!=n && PPC_PMAC
-
-config SND_AOA
+menuconfig SND_AOA
        tristate "Apple Onboard Audio driver"
-       depends on SND
+       depends on PPC_PMAC
        select SND_PCM
        ---help---
        This option enables the new driver for the various
        Apple Onboard Audio components.
 
+if SND_AOA
+
 source "sound/aoa/fabrics/Kconfig"
 
 source "sound/aoa/codecs/Kconfig"
 
 source "sound/aoa/soundbus/Kconfig"
 
-endmenu
+endif  # SND_AOA