aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-05-23 10:10:37 -0400
committerTakashi Iwai <tiwai@suse.de>2008-05-27 09:56:20 -0400
commit89fe5117928b2c1272c9376362131ded561c91ad (patch)
treed9ad58546d73efdef4d68ba3c8224a3ee5722576 /sound/aoa
parent06b5fb97cec1a3ca61d10164118b00fe98a6a866 (diff)
sound: Convert to menuconfig
Convert menu in sound Kconfig files to menuconfig and if. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa')
-rw-r--r--sound/aoa/Kconfig11
-rw-r--r--sound/aoa/codecs/Kconfig4
-rw-r--r--sound/aoa/fabrics/Kconfig1
-rw-r--r--sound/aoa/soundbus/Kconfig1
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 @@
1menu "Apple Onboard Audio driver" 1menuconfig SND_AOA
2 depends on SND!=n && PPC_PMAC
3
4config SND_AOA
5 tristate "Apple Onboard Audio driver" 2 tristate "Apple Onboard Audio driver"
6 depends on SND 3 depends on PPC_PMAC
7 select SND_PCM 4 select SND_PCM
8 ---help--- 5 ---help---
9 This option enables the new driver for the various 6 This option enables the new driver for the various
10 Apple Onboard Audio components. 7 Apple Onboard Audio components.
11 8
9if SND_AOA
10
12source "sound/aoa/fabrics/Kconfig" 11source "sound/aoa/fabrics/Kconfig"
13 12
14source "sound/aoa/codecs/Kconfig" 13source "sound/aoa/codecs/Kconfig"
15 14
16source "sound/aoa/soundbus/Kconfig" 15source "sound/aoa/soundbus/Kconfig"
17 16
18endmenu 17endif # 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 @@
1config SND_AOA_ONYX 1config SND_AOA_ONYX
2 tristate "support Onyx chip" 2 tristate "support Onyx chip"
3 depends on SND_AOA
4 select I2C 3 select I2C
5 select I2C_POWERMAC 4 select I2C_POWERMAC
6 ---help--- 5 ---help---
@@ -10,7 +9,6 @@ config SND_AOA_ONYX
10 9
11#config SND_AOA_TOPAZ 10#config SND_AOA_TOPAZ
12# tristate "support Topaz chips" 11# tristate "support Topaz chips"
13# depends on SND_AOA
14# ---help--- 12# ---help---
15# This option enables support for the Topaz (CS84xx) 13# This option enables support for the Topaz (CS84xx)
16# codec chips found in the latest Apple machines, 14# codec chips found in the latest Apple machines,
@@ -19,7 +17,6 @@ config SND_AOA_ONYX
19 17
20config SND_AOA_TAS 18config SND_AOA_TAS
21 tristate "support TAS chips" 19 tristate "support TAS chips"
22 depends on SND_AOA
23 select I2C 20 select I2C
24 select I2C_POWERMAC 21 select I2C_POWERMAC
25 ---help--- 22 ---help---
@@ -29,7 +26,6 @@ config SND_AOA_TAS
29 26
30config SND_AOA_TOONIE 27config SND_AOA_TOONIE
31 tristate "support Toonie chip" 28 tristate "support Toonie chip"
32 depends on SND_AOA
33 ---help--- 29 ---help---
34 This option enables support for the toonie codec 30 This option enables support for the toonie codec
35 found in the Mac Mini. If you have a Mac Mini and 31 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 @@
1config SND_AOA_FABRIC_LAYOUT 1config SND_AOA_FABRIC_LAYOUT
2 tristate "layout-id fabric" 2 tristate "layout-id fabric"
3 depends on SND_AOA
4 select SND_AOA_SOUNDBUS 3 select SND_AOA_SOUNDBUS
5 select SND_AOA_SOUNDBUS_I2S 4 select SND_AOA_SOUNDBUS_I2S
6 ---help--- 5 ---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 @@
1config SND_AOA_SOUNDBUS 1config SND_AOA_SOUNDBUS
2 tristate "Apple Soundbus support" 2 tristate "Apple Soundbus support"
3 depends on SOUND
4 select SND_PCM 3 select SND_PCM
5 ---help--- 4 ---help---
6 This option enables the generic driver for the soundbus 5 This option enables the generic driver for the soundbus