diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 19:48:14 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 19:48:14 -0200 |
| commit | 811d39fde60ebeaa0bb102736149c5ddecb94535 (patch) | |
| tree | 568e30e56fbfb0f6f0466d8f64622204775097f6 | |
| parent | 7fd0b3c28f9cf63b6be440d9c9d2a6598f6daa89 (diff) | |
| download | mediapointer-dvb-s2-811d39fde60ebeaa0bb102736149c5ddecb94535.tar.gz mediapointer-dvb-s2-811d39fde60ebeaa0bb102736149c5ddecb94535.tar.bz2 | |
Fix compilation against RHEL kernel
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | v4l/compat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index c2b805cec..3b04c91f6 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -368,12 +368,14 @@ static inline int usb_endpoint_is_isoc_out( #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 struct usb_endpoint_descriptor *epd) { 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(const struct usb_endpoint_descriptor *epd) #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 |