Jan,
Thanks for doing this.
> --- linux-2.6.21-mm_20070428.orig/sound/aoa/Kconfig
> +++ linux-2.6.21-mm_20070428/sound/aoa/Kconfig
> @@ -1,9 +1,12 @@
[...]
For the aoa bits this ends up having two "Apple Onboard Audio driver"
bits which is a bit confusing. How about this instead? SND_AOA was
pretty much a generic symbol to start with since it will cause snd-aoa
to be compiled but is pretty much useless on it's own. This hence makes
the core bits an invisible symbol.
--- wireless-dev.orig/sound/aoa/Kconfig 2006-10-08 19:56:35.000000000 +0200
+++ wireless-dev/sound/aoa/Kconfig 2007-04-30 16:18:12.935651366 +0200
@@ -1,13 +1,15 @@
-menu "Apple Onboard Audio driver"
- depends on SND!=n && PPC_PMAC
-
-config SND_AOA
- tristate "Apple Onboard Audio driver"
- depends on SND
+menuconfig SND_AOA
+ bool "Apple Onboard Audio driver"
+ depends on PPC_PMAC
select SND_PCM
- ---help---
- This option enables the new driver for the various
- Apple Onboard Audio components.
+ help
+ This option enables the new driver for the various
+ Apple Onboard Audio components.
+
+if SND_AOA
+
+config SND_AOA_CORE
+ tristate
source "sound/aoa/fabrics/Kconfig"
@@ -15,4 +17,4 @@ source "sound/aoa/codecs/Kconfig"
source "sound/aoa/soundbus/Kconfig"
-endmenu
+endif # SND_AOA
--- wireless-dev.orig/sound/aoa/codecs/Kconfig 2007-04-30 16:15:56.375651366
+0200
+++ wireless-dev/sound/aoa/codecs/Kconfig 2007-04-30 16:16:28.775651366
+0200
@@ -1,8 +1,8 @@
config SND_AOA_ONYX
tristate "support Onyx chip"
- depends on SND_AOA
select I2C
select I2C_POWERMAC
+ select SND_AOA_CORE
---help---
This option enables support for the Onyx (pcm3052)
codec chip found in the latest Apple machines
@@ -10,7 +10,7 @@ config SND_AOA_ONYX
config SND_AOA_TOPAZ
tristate "support Topaz chips"
- depends on SND_AOA
+ select SND_AOA_CORE
---help---
This option enables support for the Topaz (CS84xx)
codec chips found in the latest Apple machines,
@@ -22,9 +22,9 @@ config SND_AOA_TOPAZ
config SND_AOA_TAS
tristate "support TAS chips"
- depends on SND_AOA
select I2C
select I2C_POWERMAC
+ select SND_AOA_CORE
---help---
This option enables support for the tas chips
found in a lot of Apple Machines, especially
@@ -32,7 +32,7 @@ config SND_AOA_TAS
config SND_AOA_TOONIE
tristate "support Toonie chip"
- depends on SND_AOA
+ select SND_AOA_CORE
---help---
This option enables support for the toonie codec
found in the Mac Mini. If you have a Mac Mini and
--- wireless-dev.orig/sound/aoa/core/Makefile 2007-04-30 16:14:29.335651366
+0200
+++ wireless-dev/sound/aoa/core/Makefile 2007-04-30 16:14:51.795651366
+0200
@@ -1,4 +1,4 @@
-obj-$(CONFIG_SND_AOA) += snd-aoa.o
+obj-$(CONFIG_SND_AOA_CORE) += snd-aoa.o
snd-aoa-objs := snd-aoa-core.o \
snd-aoa-alsa.o \
snd-aoa-gpio-pmf.o \
--- wireless-dev.orig/sound/aoa/fabrics/Kconfig 2007-04-30 16:15:42.275651366
+0200
+++ wireless-dev/sound/aoa/fabrics/Kconfig 2007-04-30 16:16:31.845651366
+0200
@@ -1,8 +1,8 @@
config SND_AOA_FABRIC_LAYOUT
tristate "layout-id fabric"
- depends on SND_AOA
select SND_AOA_SOUNDBUS
select SND_AOA_SOUNDBUS_I2S
+ select SND_AOA_CORE
---help---
This enables the layout-id fabric for the Apple Onboard
Audio driver, the module holding it all together
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
