diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 11:56:32 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 11:56:32 +0400 |
| commit | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (patch) | |
| tree | e32a4c267dc1b5950012e18c1e71d8057140f1f5 /sound/oss/Kconfig | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
| parent | 97c44b2dbd0060e2e6bd56236eb638ab02ec7f30 (diff) | |
| download | linux-79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/Kconfig')
| -rw-r--r-- | sound/oss/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index a513651fa149..76c090218073 100644 --- 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 |