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 97e38b66558720eae20d178b4c13dfc96d17eaec..cc2b9ab7f4e5355d490aeebff240240b2a9446f1 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -115,10 +115,6 @@ config SOUND_HAL2
          Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
          use its on-board A2 audio system.
 
-config SOUND_IT8172
-       tristate "IT8172G Sound"
-       depends on SOUND_PRIME && (MIPS_ITE8172 || MIPS_IVR)
-
 config SOUND_VRC5477
        tristate "NEC Vrc5477 AC97 sound"
        depends on SOUND_PRIME && DDB5477
@@ -647,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