4 files changed, 5 insertions, 12 deletions

diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig
index 5d5813cec4c8..c081e18b9540 100644
--- 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
diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig
index d5fbd6016e93..808eb11ebacd 100644
--- a/sound/aoa/codecs/Kconfig
+++ b/sound/aoa/codecs/Kconfig
@@ -1,6 +1,5 @@
 config SND_AOA_ONYX
         tristate "support Onyx chip"
-        depends on SND_AOA
         select I2C
         select I2C_POWERMAC
         ---help---
@@ -10,7 +9,6 @@ config SND_AOA_ONYX
 
 #config SND_AOA_TOPAZ
 #       tristate "support Topaz chips"
-#       depends on SND_AOA
 #       ---help---
 #       This option enables support for the Topaz (CS84xx)
 #       codec chips found in the latest Apple machines,
@@ -19,7 +17,6 @@ config SND_AOA_ONYX
 
 config SND_AOA_TAS
         tristate "support TAS chips"
-        depends on SND_AOA
         select I2C
         select I2C_POWERMAC
         ---help---
@@ -29,7 +26,6 @@ config SND_AOA_TAS
 
 config SND_AOA_TOONIE
         tristate "support Toonie chip"
-        depends on SND_AOA
         ---help---
         This option enables support for the toonie codec
         found in the Mac Mini. If you have a Mac Mini and
diff --git a/sound/aoa/fabrics/Kconfig b/sound/aoa/fabrics/Kconfig
index 50d7021ff677..3ca475a886b1 100644
--- a/sound/aoa/fabrics/Kconfig
+++ b/sound/aoa/fabrics/Kconfig
@@ -1,6 +1,5 @@
 config SND_AOA_FABRIC_LAYOUT
         tristate "layout-id fabric"
-        depends on SND_AOA
         select SND_AOA_SOUNDBUS
         select SND_AOA_SOUNDBUS_I2S
         ---help---
diff --git a/sound/aoa/soundbus/Kconfig b/sound/aoa/soundbus/Kconfig
index 7368b7ddfe0d..839d1137b9b2 100644
--- a/sound/aoa/soundbus/Kconfig
+++ b/sound/aoa/soundbus/Kconfig
@@ -1,6 +1,5 @@
 config SND_AOA_SOUNDBUS
         tristate "Apple Soundbus support"
-        depends on SOUND
         select SND_PCM
         ---help---
         This option enables the generic driver for the soundbus