diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
| commit | 7af33dc182a51e3feda1246207c939d8459dbd61 (patch) | |
| tree | 81416520e5321725fa97909e5652ed7c87598893 /linux/drivers/media/dvb/dvb-usb | |
| parent | 1272389ee0a46d702d0dc471d791b9fae7668aed (diff) | |
| parent | b4efb4ebbf8e3e7d3d0230bf4a811f7dafeef9a0 (diff) | |
| download | mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.gz mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015
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')
| -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" |