summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx25840/cx25840-firmware.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-03-25 14:27:29 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2006-03-25 14:27:29 +0100
commit4751a104ef6a2fd3d290a38a21f32ad03bde6690 (patch)
treecfc3f96952c2b322cb5bd6a3a8e9fa56f3a80aaf /linux/drivers/media/video/cx25840/cx25840-firmware.c
parent5be880e39653de9ff425724c31dbf5a5b365fd89 (diff)
parent39f5161a61908b2803013cfc3150db76de6caaec (diff)
downloadmediapointer-dvb-s2-4751a104ef6a2fd3d290a38a21f32ad03bde6690.tar.gz
mediapointer-dvb-s2-4751a104ef6a2fd3d290a38a21f32ad03bde6690.tar.bz2
merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-firmware.c')
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-firmware.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c
index fdd78ad80..96a45a4be 100644
--- a/linux/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c
@@ -21,8 +21,9 @@
#include <linux/i2c-algo-bit.h>
#include <linux/firmware.h>
#include <media/v4l2-common.h>
+#include <media/cx25840.h>
-#include "cx25840.h"
+#include "cx25840-core.h"
#define FWFILE "v4l-cx25840.fw"
#define FWSEND 1024