diff --git a/[refs] b/[refs]
index a8853fcce800..6e5f0a0b5fb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aabf6331f89c18a46e7f083ca0b27f15ca85422
+refs/heads/master: 3717e170e1585d79a8ceced9161f18ceb796411e
diff --git a/trunk/drivers/media/video/cx25840/cx25840-firmware.c b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
index 0ce4a9550eb2..368bcc8475c7 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 "HcwMakoA.ROM"
+#define FWFILE "cx25840.fw"
 #define FWSEND 1024
 
 #define FWDEV(x) &((x)->adapter->dev)