diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-08 15:41:09 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-08 15:41:09 -0300 |
commit | c3ad1883e7776dfe16804b5947277f9565825d66 (patch) | |
tree | 69bf4ce45d354875ffb8b896eab22e1f3b4579e5 /linux/drivers/media | |
parent | 7f984a8ea578fbd3c41a53a18eecb9b67dcfb542 (diff) | |
parent | 4c2e1f97037832f0f19499d2d2f6fa0882d3104d (diff) | |
download | mediapointer-dvb-s2-c3ad1883e7776dfe16804b5947277f9565825d66.tar.gz mediapointer-dvb-s2-c3ad1883e7776dfe16804b5947277f9565825d66.tar.bz2 |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/dvb/frontends/dibx000_common.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/radio/radio-cadet.c | 1 | ||||
-rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/dibx000_common.c b/linux/drivers/media/dvb/frontends/dibx000_common.c index 002ab9337..bdc6d7a7d 100644 --- a/linux/drivers/media/dvb/frontends/dibx000_common.c +++ b/linux/drivers/media/dvb/frontends/dibx000_common.c @@ -185,3 +185,7 @@ void dibx000_exit_i2c_master(struct dibx000_i2c_master *mst) i2c_del_adapter(&mst->gated_tuner_i2c_adap); } EXPORT_SYMBOL(dibx000_exit_i2c_master); + +MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>"); +MODULE_DESCRIPTION("Common function the DiBcom demodulator family"); +MODULE_LICENSE("GPL"); diff --git a/linux/drivers/media/radio/radio-cadet.c b/linux/drivers/media/radio/radio-cadet.c index fd7bc09fc..6e089a100 100644 --- a/linux/drivers/media/radio/radio-cadet.c +++ b/linux/drivers/media/radio/radio-cadet.c @@ -30,6 +30,7 @@ * Changed API to V4L2 */ +#include <linux/version.h> #include <linux/module.h> /* Modules */ #include <linux/init.h> /* Initdata */ #include <linux/ioport.h> /* request_region */ diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c index 8a9933dec..05ea17afe 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c @@ -31,7 +31,7 @@ static void set_standard(struct pvr2_hdw *hdw) v4l2_std_id vs; vs = hdw->std_mask_cur; pvr2_trace(PVR2_TRACE_CHIPS, - "i2c v4l2 set_standard(0x%llx)",(__u64)vs); + "i2c v4l2 set_standard(0x%llx)",(long long unsigned)vs); pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs); } |