From 25c2545b3b3b5f35a60bf1d0ce5aaf89d89478b4 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 30 Oct 2008 12:53:05 +0100 Subject: cinergyT2: fix compilation on pre-2.6.18 kernels From: Hans Verkuil Priority: normal Signed-off-by: Hans Verkuil --- linux/drivers/media/dvb/dvb-usb/cinergyT2.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'linux/drivers/media/dvb') diff --git a/linux/drivers/media/dvb/dvb-usb/cinergyT2.h b/linux/drivers/media/dvb/dvb-usb/cinergyT2.h index 11d79eb38..f008b41ad 100644 --- a/linux/drivers/media/dvb/dvb-usb/cinergyT2.h +++ b/linux/drivers/media/dvb/dvb-usb/cinergyT2.h @@ -30,7 +30,11 @@ #ifndef _DVB_USB_CINERGYT2_H_ #define _DVB_USB_CINERGYT2_H_ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) #include +#else +#include +#endif #define DVB_USB_LOG_PREFIX "cinergyT2" #include "dvb-usb.h" -- cgit v1.2.3 From 1874c0ea0b23d2eab6c2c6ba5d06ab4e7191b6f8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 3 Nov 2008 09:38:43 +0100 Subject: dvbdev: fix typo causing 2.6.28 compile error From: Hans Verkuil Priority: normal Signed-off-by: Hans Verkuil --- linux/drivers/media/dvb/dvb-core/dvbdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media/dvb') diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 7348f8ead..fa1adf9dd 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -261,7 +261,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27) clsdev = device_create(dvb_class, adap->device, - MKDEV(DVB_MAJOR, minor, + MKDEV(DVB_MAJOR, minor), dvbdev, "dvb%d.%s%d", adap->num, dnames[type], id); #elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 27) clsdev = device_create_drvdata(dvb_class, adap->device, -- cgit v1.2.3 From d8814a9d943a11e3f18f1a873ec15ad74f412c5e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 31 Oct 2008 17:50:06 +0000 Subject: V4L/DVB: remove unused #include From: Huang Weiyi The file(s) below do not use LINUX_VERSION_CODE nor KERNEL_VERSION. drivers/media/dvb/frontends/si21xx.c This patch removes the said #include . CC: Igor M. Liplianin Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/frontends/si21xx.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/drivers/media/dvb') diff --git a/linux/drivers/media/dvb/frontends/si21xx.c b/linux/drivers/media/dvb/frontends/si21xx.c index 2f69a173d..216a532ab 100644 --- a/linux/drivers/media/dvb/frontends/si21xx.c +++ b/linux/drivers/media/dvb/frontends/si21xx.c @@ -8,7 +8,6 @@ * (at your option) any later version. * */ -#include #include #include #include -- cgit v1.2.3 From feb7b056ad71ef42a82b5f0c8ef659936344c5aa Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 31 Oct 2008 01:04:56 +0000 Subject: stb0899 Remove double .read_status assignment From: Igor M. Liplianin Currently in stb0899 code it appears double .read_status assignment Send patch to fix it. CC: Manu Abraham Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/dvb/frontends/stb0899_drv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'linux/drivers/media/dvb') diff --git a/linux/drivers/media/dvb/frontends/stb0899_drv.c b/linux/drivers/media/dvb/frontends/stb0899_drv.c index 02edf1760..63c547f31 100644 --- a/linux/drivers/media/dvb/frontends/stb0899_drv.c +++ b/linux/drivers/media/dvb/frontends/stb0899_drv.c @@ -272,9 +272,9 @@ int stb0899_read_reg(struct stb0899_state *state, unsigned int reg) } u32 _stb0899_read_s2reg(struct stb0899_state *state, - u32 stb0899_i2cdev, - u32 stb0899_base_addr, - u16 stb0899_reg_offset) + u32 stb0899_i2cdev, + u32 stb0899_base_addr, + u16 stb0899_reg_offset) { int status; u32 data; @@ -372,7 +372,7 @@ err: } int stb0899_write_s2reg(struct stb0899_state *state, - u32 stb0899_i2cdev, + u32 stb0899_i2cdev, u32 stb0899_base_addr, u16 stb0899_reg_offset, u32 stb0899_data) @@ -1932,7 +1932,6 @@ static struct dvb_frontend_ops stb0899_ops = { .read_status = stb0899_read_status, .read_snr = stb0899_read_snr, .read_signal_strength = stb0899_read_signal_strength, - .read_status = stb0899_read_status, .read_ber = stb0899_read_ber, .set_voltage = stb0899_set_voltage, -- cgit v1.2.3