diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 34 | ||||
| -rw-r--r-- | v4l/versions.txt | 6 |
2 files changed, 40 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 11dc57109..465b3ae8b 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -72,6 +72,15 @@ #define vmalloc_32_user(a) vmalloc_32(a) #endif +#ifndef DIV_ROUND_CLOSEST +#define DIV_ROUND_CLOSEST(x, divisor)( \ +{ \ + typeof(divisor) __divisor = divisor; \ + (((x) + ((__divisor) / 2)) / (__divisor)); \ +} \ +) +#endif + #ifdef NEED_BOOL_TYPE /* bool type and enum-based definition of true and false was added in 2.6.19 */ typedef int bool; @@ -480,4 +489,29 @@ static inline unsigned long v4l_compat_fls(unsigned long x) } #endif +/* + * Compatibility code for hrtimer API + * This will make hrtimer usable for kernels 2.6.22 and later. + * For earlier kernels, not all required functions are exported + * so there's nothing we can do. + */ + +#ifdef _LINUX_HRTIMER_H +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) +/* Forward a hrtimer so it expires after the hrtimer's current now */ +static inline unsigned long hrtimer_forward_now(struct hrtimer *timer, + ktime_t interval) +{ + return hrtimer_forward(timer, timer->base->get_time(), interval); +} +#endif +#endif /* _LINUX_HRTIMER_H */ + +#ifndef PCI_VDEVICE +#define PCI_VDEVICE(vendor, device) \ + PCI_VENDOR_ID_##vendor, (device), \ + PCI_ANY_ID, PCI_ANY_ID, 0, 0 +#endif + #endif /* _COMPAT_H */ diff --git a/v4l/versions.txt b/v4l/versions.txt index 01b553d6c..413ede9e8 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -29,6 +29,8 @@ SOC_CAMERA_MT9M001 [2.6.24] # Some freezer routines USB_GSPCA_SN9C20X_EVDEV +# Requires linux/mmc/sdio_func.h +SMS_SDIO_DRV [2.6.23] # Needs field intf_assoc in struct usb_host_config @@ -45,12 +47,16 @@ DVB_DRX397XD DVB_DM1105 # This driver needs print_hex_dump DVB_FIREDTV +# This driver needs hrtimer API +VIDEO_CX88 [2.6.20] #This driver requires HID_REQ_GET_REPORT USB_SI470X +RADIO_SI470X # use of struct delayed_work USB_GSPCA_FINEPIX +USB_GSPCA_JEILINJ # uses linux/hid.h and struct delayed_work USB_SI470X # due to INIT_WORK changes |