merge: http://linuxtv.org/hg/~hgoede/gspca/

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 61 insertions, 6 deletions

diff --git a/v4l/Makefile b/v4l/Makefile
index 23ae32cad..29b9675ae 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -57,6 +57,9 @@ firmware::
 v4l2-spec::
 	$(MAKE) -C ../v4l2-spec
 
+man::
+	$(MAKE) -C ../v4l2-spec man
+
 dvb-spec::
 	$(MAKE) -C ../dvb-spec/dvbapi
 
@@ -225,6 +228,9 @@ remove rminstall:: media-rminstall
 firmware_install::
 	make -C firmware install
 
+man_install::
+	$(MAKE) -C ../v4l2-spec man_install
+
 #################################################
 # Compiling preparation rules
 
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..1995c9006 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -12,6 +12,17 @@ VIDEO_DM355_CCDC
 # Needs defines that are only available from 2.6.29
 VIDEO_PXA27x
 
+[2.6.28]
+# dev_get_drvdata switched to const struct device *
+SOC_CAMERA
+SOC_CAMERA_MT9V022
+SOC_CAMERA_MT9M001
+SOC_CAMERA_MT9M111
+SOC_CAMERA_MT9T031
+SOC_CAMERA_OV772X
+SOC_CAMERA_TW9910
+SOC_CAMERA_PLATFORM
+
 [2.6.26]
 # Requires struct i2c_device_id
 VIDEO_TVP514X
@@ -19,16 +30,14 @@ VIDEO_TVP514X
 RADIO_TEA5764
 VIDEO_THS7303
 VIDEO_ADV7343
-
-[2.6.25]
-# Requires gpiolib
-SOC_CAMERA
-SOC_CAMERA_MT9V022
-SOC_CAMERA_MT9M001
+RADIO_SI4713
+I2C_SI4713
 
 [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 +54,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
@@ -73,6 +86,8 @@ VIDEO_USBVISION
 # Uses supports_autosuspend
 USB_MR800
 USB_DSBR
+# Uses MODULE_FIRMWARE
+DVB_AV7110
 
 # Uses remap_vmalloc_range()
 [2.6.18]