---

yaml --- r: 206687 b: refs/heads/master c: ff388f2 h: refs/heads/master i: 206685: 9113779 206683: cc2dc0e 206679: c57e7df 206671: 056ef33 206655: f3855c3 v: v3
git-mirror · Jul 21, 2010 · c18f559 · c18f559
1 parent dec54e4
commit c18f559
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68bf57001f4995a25ca65f3711ff05b6ea25e8b6
+refs/heads/master: ff388f270d926d95d70e5b3d373c9cb97b38c8b1
diff --git a/trunk/sound/oss/vidc.c b/trunk/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: