diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-25 14:27:29 +0100 |
---|---|---|
committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-25 14:27:29 +0100 |
commit | 4751a104ef6a2fd3d290a38a21f32ad03bde6690 (patch) | |
tree | cfc3f96952c2b322cb5bd6a3a8e9fa56f3a80aaf /linux/drivers/media/video/cx25840/cx25840-audio.c | |
parent | 5be880e39653de9ff425724c31dbf5a5b365fd89 (diff) | |
parent | 39f5161a61908b2803013cfc3150db76de6caaec (diff) | |
download | mediapointer-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-audio.c')
-rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-audio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-audio.c b/linux/drivers/media/video/cx25840/cx25840-audio.c index 2b3ad34f0..9b9133804 100644 --- a/linux/drivers/media/video/cx25840/cx25840-audio.c +++ b/linux/drivers/media/video/cx25840/cx25840-audio.c @@ -20,11 +20,12 @@ #include <linux/videodev2.h> #include <linux/i2c.h> #include <media/v4l2-common.h> +#include <media/cx25840.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #include "i2c-compat.h" #endif -#include "cx25840.h" +#include "cx25840-core.h" static int set_audclk_freq(struct i2c_client *client, u32 freq) { |