diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:39:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:39:57 -0300 |
| commit | 56dee54783bcafee32bb681a221d4c9a2b517ca3 (patch) | |
| tree | 7c235d7915b350af4e542e81b3bf385f7f6f99db /linux/drivers/media/video/bt8xx | |
| parent | fc035425e7b3d9c08a27b6860bf1b28abb1454cf (diff) | |
| download | mediapointer-dvb-s2-56dee54783bcafee32bb681a221d4c9a2b517ca3.tar.gz mediapointer-dvb-s2-56dee54783bcafee32bb681a221d4c9a2b517ca3.tar.bz2 | |
Fix v4l-dvb backward compatibility
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Due to several internal API changes on kernel, kernel backward
compatibility were lost. Basically, compat.h should be the last include
for it to work properly.
This patch basically reorders kernel headers to allow backward compat to
work fine.
Also:
Some includes were added after some non-include macros, on old drivers.
Better to keep all includes at the beginning of the files.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-input.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c index fb5df7238..5a5fdd8e2 100644 --- a/linux/drivers/media/video/bt8xx/bttv-input.c +++ b/linux/drivers/media/video/bt8xx/bttv-input.c @@ -25,7 +25,6 @@ #include <linux/interrupt.h> #include <linux/input.h> -#include "compat.h" #include "bttv.h" #include "bttvp.h" diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h index 582ac6c90..b6ee3cd0f 100644 --- a/linux/drivers/media/video/bt8xx/bttv.h +++ b/linux/drivers/media/video/bt8xx/bttv.h @@ -14,9 +14,9 @@ #ifndef _BTTV_H_ #define _BTTV_H_ -#include "compat.h" #include <linux/videodev.h> #include <linux/i2c.h> +#include "compat.h" #include <media/ir-common.h> #include <media/ir-kbd-i2c.h> #include <media/i2c-addr.h> 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" |