Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index fe175151f08978ebbd5e6b6fadde3bd9c8714f53..b65ee4701f98fab7d6564d9cee6d771455aa3603 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -46,7 +46,7 @@ config SND
          Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture),
          the new base sound system.
 
-         For more information, see http://www.alsa-project.org/
+         For more information, see <http://www.alsa-project.org/>
 
 source "sound/core/Kconfig"
 
@@ -77,7 +77,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)"