Merge branch 'master' into tk71

[mv-sheeva.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index a513651fa149897061406c166904277ea5f67131..76c09021807325944e3edb8b57bc2525e14b306c 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -545,11 +545,3 @@ config SOUND_KAHLUA
 
 endif  # SOUND_OSS
 
-config SOUND_SH_DAC_AUDIO
-       tristate "SuperH DAC audio support"
-       depends on CPU_SH3 && HIGH_RES_TIMERS
-
-config SOUND_SH_DAC_AUDIO_CHANNEL
-       int "DAC channel"
-       default "1"
-       depends on SOUND_SH_DAC_AUDIO