The patch number 10147 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Mauro Carvalho Chehab <[email protected]>
Fix compilation against RHEL kernel
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
v4l/compat.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff -r 1e8776bf9900 -r 84d0095ac0bd v4l/compat.h
--- a/v4l/compat.h Tue Dec 30 19:38:11 2008 -0200
+++ b/v4l/compat.h Tue Dec 30 19:48:14 2008 -0200
@@ -368,12 +368,14 @@ static inline int usb_endpoint_is_isoc_o
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+#ifndef RHEL_HAS_USB_ENDPOINT
static inline int usb_endpoint_xfer_control(
const struct usb_endpoint_descriptor *epd)
{
return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_CONTROL);
}
+#endif /* RHEL_HAS_USB_ENDPOINT */
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
@@ -381,7 +383,9 @@ static inline int usb_endpoint_num(const
{
return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
}
-
+#endif
+
+#ifdef NEED_USB_ENDPOINT_TYPE
static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
{
return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
@@ -406,9 +410,5 @@ static inline int usb_endpoint_type(cons
#define netdev_priv(dev) ((dev)->priv)
#endif
-#ifdef NEED_USB_ENDPOINT_TYPE
-#define usb_endpoint_type(ep) \
- ((ep)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-#endif
-
-#endif
+
+#endif
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/84d0095ac0bd956458ca3f2aaa7945442f67ec0e
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
