diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
| commit | 74bf40f0793fed9e01eb6164c2ce63e8c27ca205 (patch) | |
| tree | f41312c0943978842ac258873b29da04d72d0625 /sound/oss/vidc.c | |
| parent | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (diff) | |
| parent | c4685849b4d725ab80cd29f5e09f5f128b4724b5 (diff) | |
| download | linux-stable-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.gz linux-stable-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.bz2 linux-stable-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/vidc.c')
| -rw-r--r-- | sound/oss/vidc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index ac39a531df19..f0e0caa53200 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c @@ -491,9 +491,6 @@ static void __init attach_vidc(struct address_info *hw_config) vidc_adev = adev; vidc_mixer_set(SOUND_MIXER_VOLUME, (85 | 85 << 8)); -#if defined(CONFIG_SOUND_SOFTOSS) || defined(CONFIG_SOUND_SOFTOSS_MODULE) - softoss_dev = adev; -#endif return; irq_failed: |