From c18f559c272bae02c43e1df76b370f478816532b Mon Sep 17 00:00:00 2001
From: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Date: Wed, 21 Jul 2010 14:35:17 +0200
Subject: [PATCH] --- yaml --- r: 206687 b: refs/heads/master c:
 ff388f270d926d95d70e5b3d373c9cb97b38c8b1 h: refs/heads/master i:   206685:
 91137790f837ca3f1317f4b4ed1b3ae3a7cb53b8   206683:
 cc2dc0ee19c63be33e96349babad3d068d998c9e   206679:
 c57e7dfee425126019d2355df004fd07d1c8f85d   206671:
 056ef33508320216c5ef107f325d0b9e605dbc0f   206655:
 f3855c3ef9bdd3441ab94c074096076cf3b24ab3 v: v3

---
 [refs]                 | 2 +-
 trunk/sound/oss/vidc.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 54f61ed33f01..a0fb50d220ea 100644
--- 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
index ac39a531df19..f0e0caa53200 100644
--- 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: