Merge branch 'master' into devel

[linux-2.6-block.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index b3e53e616ec984c8115152c130b182cc86f2cb9a..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


@@ -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.

-