Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index f3b3530402cb6251404b1210a76d74c5f609969b..cc2b9ab7f4e5355d490aeebff240240b2a9446f1 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -643,7 +643,7 @@ config SOUND_PSS
          command line.
 
 config PSS_MIXER
-       bool "Enable PSS mixer (Beethoven ADSP-16 and other compatibile)"
+       bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)"
        depends on SOUND_PSS
        help
          Answer Y for Beethoven ADSP-16. You may try to say Y also for other