diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:48:29 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:48:29 -0200 |
| commit | 6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b (patch) | |
| tree | 7e1fac27df4358a4ffb22c41d5039ef35260239e /linux/drivers/media/video/usbvideo/quickcam_messenger.c | |
| parent | 3163e57be54a44818c4bdaafa54f1f5a23dd5f4f (diff) | |
| parent | a47be5953c72392a7be1efafc70621242275f08f (diff) | |
| download | mediapointer-dvb-s2-6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b.tar.gz mediapointer-dvb-s2-6cefcaedffe3456acaf4d72d63c07c8b3a9a8d8b.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvideo/quickcam_messenger.c')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/quickcam_messenger.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c index 614c821ed..849f94bab 100644 --- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c @@ -33,15 +33,15 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/input.h> -#include "compat.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -#include <linux/usb_input.h> -#else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) #include <linux/usb/input.h> +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) +#include <linux/usb_input.h> #endif #include "usbvideo.h" #include "quickcam_messenger.h" +#include "compat.h" /* * Version Information @@ -105,7 +105,11 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev) input_dev->name = "QCM button"; input_dev->phys = cam->input_physname; usb_to_input_id(dev, &input_dev->id); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) input_dev->cdev.dev = &dev->dev; +#else + input_dev->dev = &dev->dev; +#endif input_dev->evbit[0] = BIT(EV_KEY); input_dev->keybit[LONG(BTN_0)] = BIT(BTN_0); |