diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 09:05:23 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 09:05:23 -0200 |
| commit | c1ad9834d2d8678d26d3ce2a6cf39038345c33f7 (patch) | |
| tree | 4f0ef2cd6728a226c78d62abf7c463ffd3a3d403 /linux/drivers/media/common | |
| parent | 9047bbc89eed91f91b8e0e7b3341bf696515889a (diff) | |
| parent | 0c10299d80fe45160d3c79fd58634ae3b1c025db (diff) | |
| download | mediapointer-dvb-s2-c1ad9834d2d8678d26d3ce2a6cf39038345c33f7.tar.gz mediapointer-dvb-s2-c1ad9834d2d8678d26d3ce2a6cf39038345c33f7.tar.bz2 | |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/ir-functions.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_vbi.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c index 5280402e8..a15f5f34e 100644 --- a/linux/drivers/media/common/ir-functions.c +++ b/linux/drivers/media/common/ir-functions.c @@ -20,12 +20,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "compat.h" #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/string.h> #include <linux/jiffies.h> #include <media/ir-common.h> +#include "compat.h" /* -------------------------------------------------------------------------- */ diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 6b429ff37..67d4d1a51 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -1,5 +1,5 @@ -#include "compat.h" #include <media/saa7146_vv.h> +#include "compat.h" #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) @@ -417,7 +417,7 @@ static ssize_t fops_write(struct file *file, const char __user *data, size_t cou } } -static struct file_operations video_fops = +static const struct file_operations video_fops = { .owner = THIS_MODULE, .open = fops_open, diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index dffa769ef..3ae8660be 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -1,5 +1,5 @@ -#include "compat.h" #include <media/saa7146_vv.h> +#include "compat.h" static u32 saa7146_i2c_func(struct i2c_adapter *adapter) { diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index 510594fbd..2c63875d1 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -1,5 +1,5 @@ -#include "compat.h" #include <media/saa7146_vv.h> +#include "compat.h" static int vbi_pixel_to_capture = 720 * 2; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 1fb373ee2..35288c4bc 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1,5 +1,5 @@ -#include "compat.h" #include <media/saa7146_vv.h> +#include "compat.h" static int max_memory = 32; |