diff --git a/[refs] b/[refs]
index ec2df4937762..25a31810ee32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3e63002433d9a3de763b6cb49dc2c75a74d8604
+refs/heads/master: 60f6c464d14b177778334344c86f15616899735a
diff --git a/trunk/drivers/media/video/cx25840/cx25840-firmware.c b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
index 368bcc8475c7..df9d50a75542 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
@@ -24,7 +24,7 @@
 
 #include "cx25840.h"
 
-#define FWFILE "cx25840.fw"
+#define FWFILE "v4l-cx25840.fw"
 #define FWSEND 1024
 
 #define FWDEV(x) &((x)->adapter->dev)