Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 439e15c8faa3d5f3ee7ef3b101bd9933c6ac6140..fcad760f56919906bfe4f43867c9a2cac2f7aca5 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -1,6 +1,3 @@
-# sound/Config.in
-#
-

 menuconfig SOUND
        tristate "Sound card support"
        depends on HAS_IOMEM
 menuconfig SOUND
        tristate "Sound card support"
        depends on HAS_IOMEM


@@ -58,7 +55,7 @@ config SOUND_OSS_CORE_PRECLAIM
          Please read Documentation/feature-removal-schedule.txt for
          details.
 
          Please read Documentation/feature-removal-schedule.txt for
          details.
 

-         If unusre, say Y.
+         If unsure, say Y.

 
 source "sound/oss/dmasound/Kconfig"
 
 
 source "sound/oss/dmasound/Kconfig"
 


@@ -136,4 +133,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.
          sound subsystem and other function drivers completely unrelated to
          sound although they're sharing the AC97 bus. Concerned drivers
          should "select" this.

-