Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index b65ee4701f98fab7d6564d9cee6d771455aa3603..e0d791a9845246b907fde876d441b46852c4268f 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -58,6 +58,8 @@ source "sound/pci/Kconfig"
 
 source "sound/ppc/Kconfig"
 
+source "sound/aoa/Kconfig"
+
 source "sound/arm/Kconfig"
 
 source "sound/mips/Kconfig"