diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:58:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:58:50 -0300 |
| commit | b08432f588a4161f12dd8419a2673ba582c9d3ab (patch) | |
| tree | 4ec2fd257cac5434cf2d3cda154f65d77e5006f1 /linux/drivers/media/video/saa7111.c | |
| parent | 424e8229ba171eb97b4d366990e3dd17b1eade74 (diff) | |
| parent | ff3f4061e1e6854e0d2c8c52c2363f3d67302651 (diff) | |
| download | mediapointer-dvb-s2-b08432f588a4161f12dd8419a2673ba582c9d3ab.tar.gz mediapointer-dvb-s2-b08432f588a4161f12dd8419a2673ba582c9d3ab.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/pending
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7111.c')
| -rw-r--r-- | linux/drivers/media/video/saa7111.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7111.c b/linux/drivers/media/video/saa7111.c index 4c201e4bb..edd035470 100644 --- a/linux/drivers/media/video/saa7111.c +++ b/linux/drivers/media/video/saa7111.c @@ -37,24 +37,24 @@ #include <linux/slab.h> #include <linux/mm.h> #include <linux/signal.h> +#include <linux/types.h> +#include <linux/i2c.h> #include <asm/io.h> #include <asm/pgtable.h> #include <asm/page.h> -#include <linux/types.h> +#include <asm/uaccess.h> -#include "compat.h" #include <linux/videodev.h> -#include <asm/uaccess.h> +#include <linux/video_decoder.h> +#include "compat.h" MODULE_DESCRIPTION("Philips SAA7111 video decoder driver"); MODULE_AUTHOR("Dave Perks"); MODULE_LICENSE("GPL"); -#include <linux/i2c.h> #define I2C_NAME(s) (s)->name -#include <linux/video_decoder.h> static int debug = 0; module_param(debug, int, 0644); |