mmc: tegra: Add post resume support
[linux-2.6.git] / sound / Kconfig
index 439e15c..261a03c 100644 (file)
@@ -1,6 +1,3 @@
-# sound/Config.in
-#
-
 menuconfig SOUND
        tristate "Sound card support"
        depends on HAS_IOMEM
@@ -58,11 +55,11 @@ config SOUND_OSS_CORE_PRECLAIM
          Please read Documentation/feature-removal-schedule.txt for
          details.
 
-         If unusre, say Y.
+         If unsure, say Y.
 
 source "sound/oss/dmasound/Kconfig"
 
-if !M68K
+if !M68K && !UML
 
 menuconfig SND
        tristate "Advanced Linux Sound Architecture"
@@ -100,6 +97,8 @@ source "sound/sh/Kconfig"
 # here assuming USB is defined before ALSA
 source "sound/usb/Kconfig"
 
+source "sound/firewire/Kconfig"
+
 # the following will depend on the order of config.
 # here assuming PCMCIA is defined before ALSA
 source "sound/pcmcia/Kconfig"
@@ -136,4 +135,3 @@ config AC97_BUS
          sound subsystem and other function drivers completely unrelated to
          sound although they're sharing the AC97 bus. Concerned drivers
          should "select" this.
-