diff options
| -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 | ||||
| -rwxr-xr-x | v4l/scripts/makelinks.sh | 12 |
4 files changed, 6 insertions, 13 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); } diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 187145822..9ee780aba 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -48,15 +48,3 @@ for x in `find drivers/media -type d | grep -v CVS` ; do done cd .. -patch -p0 <<'DIFF' -diff -u -p videodev.h ---- linux/include/linux/videodev.h -+++ linux/include/linux/videodev.h -@@ -1,6 +1,7 @@ - #ifndef __LINUX_VIDEODEV_H - #define __LINUX_VIDEODEV_H - -+#include "compat.h" - #include <linux/types.h> - - #define HAVE_V4L1 1 |