diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
commit | f908968983a448cba404613e0564a7097b63558f (patch) | |
tree | 31f33203850a0c4fcde070ee5e0795880ca7c8fd /linux/drivers/media/dvb/dvb-usb/cinergyT2.h | |
parent | 94703235501e112e7496efe5bce32671e121d98f (diff) | |
parent | 0cb9746f402b6eb2d3220ae59b522cddf4db9bcd (diff) | |
download | mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.gz mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/cinergyT2.h')
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/cinergyT2.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 <linux/usb/input.h> +#else +#include <linux/usb_input.h> +#endif #define DVB_USB_LOG_PREFIX "cinergyT2" #include "dvb-usb.h" |