diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 16:55:02 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 16:55:02 -0300 |
commit | 24b1cf4ab4be6bebbdc0c76a2ad7d25a39ce7d3f (patch) | |
tree | b326863f704290d43c8861f13bd773f9cca798d6 /linux/drivers/media/video/bt8xx/bttvp.h | |
parent | d531e1dbeb7dad87f971e1d651c925b11e99b9cb (diff) | |
parent | b08432f588a4161f12dd8419a2673ba582c9d3ab (diff) | |
download | mediapointer-dvb-s2-24b1cf4ab4be6bebbdc0c76a2ad7d25a39ce7d3f.tar.gz mediapointer-dvb-s2-24b1cf4ab4be6bebbdc0c76a2ad7d25a39ce7d3f.tar.bz2 |
merge: http://www.linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttvp.h')
-rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index eee6f5ae3..9428a665d 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -25,7 +25,6 @@ #ifndef _BTTVP_H_ #define _BTTVP_H_ -#include "compat.h" #include <linux/version.h> #define BTTV_VERSION_CODE KERNEL_VERSION(0,9,17) @@ -34,7 +33,6 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/videodev.h> -#include <media/v4l2-common.h> #include <linux/pci.h> #include <linux/input.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) @@ -42,6 +40,8 @@ #endif #include <asm/scatterlist.h> #include <asm/io.h> +#include "compat.h" +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #include "i2c-compat.h" |