diff options
| author | Erik Andrén <erik.andren@gmail.com> | 2008-12-26 11:58:34 +0100 |
|---|---|---|
| committer | Erik Andrén <erik.andren@gmail.com> | 2008-12-26 11:58:34 +0100 |
| commit | da1d0789d659be9f1d2568351f2b9f3d81345aed (patch) | |
| tree | 71e1067d4024c066f1b7b651205a9cbc222691da /linux/drivers/media/video/uvc/uvc_status.c | |
| parent | cbd16cf5e7e4aae60ca283ad27bafae1fcb21102 (diff) | |
| parent | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (diff) | |
| download | mediapointer-dvb-s2-da1d0789d659be9f1d2568351f2b9f3d81345aed.tar.gz mediapointer-dvb-s2-da1d0789d659be9f1d2568351f2b9f3d81345aed.tar.bz2 | |
Merge with the main gspca tree.
From: Erik Andrén <erik.andren@gmail.com>
Priority: normal
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_status.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_status.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_status.c b/linux/drivers/media/video/uvc/uvc_status.c index 5d60b264d..ab62d7bf9 100644 --- a/linux/drivers/media/video/uvc/uvc_status.c +++ b/linux/drivers/media/video/uvc/uvc_status.c @@ -15,7 +15,11 @@ #include <linux/version.h> #include <linux/input.h> #include <linux/usb.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) +#include <linux/usb_input.h> +#else #include <linux/usb/input.h> +#endif #include "uvcvideo.h" @@ -45,7 +49,11 @@ static int uvc_input_init(struct uvc_device *dev) input->name = dev->name; input->phys = phys; usb_to_input_id(udev, &input->id); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) input->dev.parent = &dev->intf->dev; +#else + input->cdev.dev = &dev->intf->dev; +#endif set_bit(EV_KEY, input->evbit); set_bit(BTN_0, input->keybit); @@ -118,7 +126,11 @@ static void uvc_event_control(struct uvc_device *dev, __u8 *data, int len) data[1], data[3], attrs[data[4]], len); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) +static void uvc_status_complete(struct urb *urb, struct pt_regs *regs) +#else static void uvc_status_complete(struct urb *urb) +#endif { struct uvc_device *dev = urb->context; int len, ret; |