diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-21 17:46:33 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-21 17:46:33 -0200 |
commit | 4b7dae6f98287343f5a4943ec5f1466444fe9b98 (patch) | |
tree | de05d30516f47c695386d50ae07e5a2bd8be68a6 /linux/drivers/media/video/m52790.c | |
parent | 292c0c5ab82d5a731c3469f5f7f00dc4485b0a7f (diff) | |
parent | b0084bc50abc9f710c70c170096bf2d8b2efe610 (diff) | |
download | mediapointer-dvb-s2-4b7dae6f98287343f5a4943ec5f1466444fe9b98.tar.gz mediapointer-dvb-s2-4b7dae6f98287343f5a4943ec5f1466444fe9b98.tar.bz2 |
merge: http://linuxtv.org/hg/~stoth/xc5000
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/m52790.c')
-rw-r--r-- | linux/drivers/media/video/m52790.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/m52790.c b/linux/drivers/media/video/m52790.c index 804ef3005..fa49d8f3e 100644 --- a/linux/drivers/media/video/m52790.c +++ b/linux/drivers/media/video/m52790.c @@ -30,7 +30,7 @@ #include <media/m52790.h> #include <media/v4l2-common.h> #include <media/v4l2-chip-ident.h> -#include <media/v4l2-i2c-drv-legacy.h> +#include <media/v4l2-i2c-drv.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) #include "i2c-compat.h" #include <linux/slab.h> |