diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-19 18:03:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-19 18:03:23 -0300 |
| commit | 20d8713a89d5f49511495e944294806642ec6a13 (patch) | |
| tree | 6ccc61b6fd17f9a232f893d9609a64b9ec0969ce /linux/drivers | |
| parent | 2ed77cf169e469102ebe5fd8d03e6b083323f26e (diff) | |
| download | mediapointer-dvb-s2-20d8713a89d5f49511495e944294806642ec6a13.tar.gz mediapointer-dvb-s2-20d8713a89d5f49511495e944294806642ec6a13.tar.bz2 | |
sn9c20x: backport to work since 2.6.18
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Make sn9c20x driver to work with RHEL5 kernel. Yet, the event interface
needs a little more work. Since I'm lazy, I've backported just the
webcam driver.
While here, reorder includes to the order used on other drivers.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/gspca/sn9c20x.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/sn9c20x.c b/linux/drivers/media/video/gspca/sn9c20x.c index 78ab26ceb..a516866a2 100644 --- a/linux/drivers/media/video/gspca/sn9c20x.c +++ b/linux/drivers/media/video/gspca/sn9c20x.c @@ -18,17 +18,21 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "gspca.h" -#include "jpeg.h" - -#include <media/v4l2-chip-ident.h> #ifdef CONFIG_USB_GSPCA_SN9C20X_EVDEV #include <linux/kthread.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) #include <linux/freezer.h> +#endif #include <linux/usb/input.h> #include <linux/input.h> #endif +#include "gspca.h" +#include "jpeg.h" +#include "compat.h" + +#include <media/v4l2-chip-ident.h> + MODULE_AUTHOR("Brian Johnson <brijohn@gmail.com>, " "microdia project <microdia@googlegroups.com>"); MODULE_DESCRIPTION("GSPCA/SN9C20X USB Camera Driver"); @@ -2409,8 +2413,10 @@ static struct usb_driver sd_driver = { #ifdef CONFIG_PM .suspend = gspca_suspend, .resume = gspca_resume, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) .reset_resume = gspca_resume, #endif +#endif }; /* -- module insert / remove -- */ |