Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index ee794ae06040a2cf768092f79300ab4f8f1cf4fe..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"
@@ -77,7 +79,7 @@ source "sound/parisc/Kconfig"
 endmenu
 
 menu "Open Sound System"
-       depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
+       depends on SOUND!=n
 
 config SOUND_PRIME
        tristate "Open Sound System (DEPRECATED)"