From 0802c290c869d13af84794ab256bbe6ef66e08c7 Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Sun, 6 Aug 2006 13:49:09 +0200 Subject: Make the dibx000-common-module GPL From: Patrick Boettcher Forget to put the MODULE-define and thus to give the license. Now GPL Signed-off-by: Patrick Boettcher --- linux/drivers/media/dvb/frontends/dibx000_common.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'linux') 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 "); +MODULE_DESCRIPTION("Common function the DiBcom demodulator family"); +MODULE_LICENSE("GPL"); -- cgit v1.2.3 From d0107f4299414236448ef5f59fd237e0a370827d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 8 Aug 2006 10:52:22 -0300 Subject: git-dvb: cadet build fix From: Andrew Morton drivers/media/radio/radio-cadet.c: In function 'cadet_do_ioctl': drivers/media/radio/radio-cadet.c:362: warning: implicit declaration of function 'KERNEL_VERSION' Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/radio/radio-cadet.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux') 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 #include /* Modules */ #include /* Initdata */ #include /* request_region */ -- cgit v1.2.3 From eb1b1058e914cbc5e03eb96ccf8084c98d358ddc Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 8 Aug 2006 15:21:47 -0300 Subject: Fix a warning on PPC64 From: Mauro Carvalho Chehab drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c: In function 'set_standard': drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c:33: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'v4l2_std_id' Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux') 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); } -- cgit v1.2.3