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: