diff options
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-core.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-core.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-core.c b/linux/drivers/media/video/usbvision/usbvision-core.c index bdb822e30..37e3ee142 100644 --- a/linux/drivers/media/video/usbvision/usbvision-core.c +++ b/linux/drivers/media/video/usbvision/usbvision-core.c @@ -1,6 +1,6 @@ /* * usbvision-core.c - driver for NT100x USB video capture devices - * + * * * Copyright (c) 1999-2005 Joerg Heckenbach <joerg@heckenbach-aw.de> * Dwaine Garden <dwainegarden@rogers.com> @@ -49,12 +49,12 @@ #include <media/audiochip.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - #include <linux/proc_fs.h> - #include <linux/tqueue.h> - #include <linux/wrapper.h> +#include <linux/proc_fs.h> +#include <linux/tqueue.h> +#include <linux/wrapper.h> #else - #include <linux/moduleparam.h> - #include <linux/workqueue.h> +#include <linux/moduleparam.h> +#include <linux/workqueue.h> #endif #ifdef CONFIG_KMOD @@ -2507,11 +2507,11 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision) int j, k; struct urb *urb; - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - urb = usb_alloc_urb(USBVISION_URB_FRAMES); - #else - urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL); - #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + urb = usb_alloc_urb(USBVISION_URB_FRAMES); +#else + urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL); +#endif if (urb == NULL) { err("%s: usb_alloc_urb() failed", __FUNCTION__); return -ENOMEM; @@ -2520,12 +2520,12 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision) urb->dev = dev; urb->context = usbvision; urb->pipe = usb_rcvisocpipe(dev, usbvision->video_endp); - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) urb->transfer_flags = USB_ISO_ASAP; - #else +#else urb->transfer_flags = URB_ISO_ASAP; urb->interval = 1; - #endif +#endif urb->transfer_buffer = usbvision->sbuf[bufIdx].data; urb->complete = usbvision_isocIrq; urb->number_of_packets = USBVISION_URB_FRAMES; |