From ed64bf8197919b2832c87bc2788287048ae26723 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 3 Aug 2012 13:39:28 -0300
Subject: [PATCH] --- yaml --- r: 330768 b: refs/heads/master c:
 229fd7d2f19c650c34034885180f91574e837bbb h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/cpia2/cpia2_core.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6fda45b41c90..f31fb1553e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddb9fa25be0babd17952821f76897931b56d490f
+refs/heads/master: 229fd7d2f19c650c34034885180f91574e837bbb
diff --git a/trunk/drivers/media/video/cpia2/cpia2_core.c b/trunk/drivers/media/video/cpia2/cpia2_core.c
index 17188e234770..187012ce444b 100644
--- a/trunk/drivers/media/video/cpia2/cpia2_core.c
+++ b/trunk/drivers/media/video/cpia2/cpia2_core.c
@@ -31,11 +31,15 @@
 
 #include "cpia2.h"
 
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/firmware.h>
 
+#define FIRMWARE "cpia2/stv0672_vp4.bin"
+MODULE_FIRMWARE(FIRMWARE);
+
 /* #define _CPIA2_DEBUG_ */
 
 #ifdef _CPIA2_DEBUG_
@@ -898,7 +902,7 @@ static int cpia2_send_onebyte_command(struct camera_data *cam,
 static int apply_vp_patch(struct camera_data *cam)
 {
 	const struct firmware *fw;
-	const char fw_name[] = "cpia2/stv0672_vp4.bin";
+	const char fw_name[] = FIRMWARE;
 	int i, ret;
 	struct cpia2_command cmd;