r5u870

commit 2a8386a6af76c11e58cd3848361e607c40ad84a4
parent 1ee2691da7b15651a7c8706008aa7af9b2d5a684
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Sat,  5 Jul 2008 07:50:02 +0000

Hrm, I should've tested this originally.
Fix rename of a core videobuf command.


git-svn-id: http://svn.mediati.org/svn/r5u870/trunk@89 022568fa-442e-4ef8-a3e8-54dcafdb011a

Diffstat:
M
usbcam/usbcam.h
 | 
9
---------
M
usbcam/usbcam_priv.h
 | 
4
++++

2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/usbcam/usbcam.h b/usbcam/usbcam.h
@@ -749,15 +749,6 @@ extern int usbcam_urbstream_config_bulk(struct usbcam_urbstream *usp,
 #define V4L2_CTRL_FLAG_UPDATE 0
 #endif
 #endif  /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */
-
-#else
-
-#if !defined(videobuf_queue_pci_init)
-#if defined(videobuf_queue_sg_init)
-#define videobuf_queue_pci_init videobuf_queue_sg_init
-#endif
-#endif
-
 #endif /* __KERNEL__ */
 
 
diff --git a/usbcam/usbcam_priv.h b/usbcam/usbcam_priv.h
@@ -63,6 +63,10 @@
 	(((EPD)->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN)
 #define usb_autopm_get_interface(X) 0
 #define usb_autopm_put_interface(X)
+#else
+#if !defined(videobuf_queue_pci_init)
+#define videobuf_queue_pci_init videobuf_queue_sg_init
+#endif
 #endif  /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) */