diff --git a/[refs] b/[refs]
index 8177aee50277..5362f3f3e719 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9b071c77ad3b97fce3d598d2d417c097369ccaf
+refs/heads/master: 0d8e1d0637a4636b0c19c94ba633812421544d91
diff --git a/trunk/drivers/media/video/cx18/cx18-alsa.c b/trunk/drivers/media/video/cx18/cx18-alsa-main.c
similarity index 100%
rename from trunk/drivers/media/video/cx18/cx18-alsa.c
rename to trunk/drivers/media/video/cx18/cx18-alsa-main.c