diff options
| -rw-r--r-- | linux/drivers/media/video/gspca/sn9c20x.c | 14 | ||||
| -rw-r--r-- | v4l/versions.txt | 2 |
2 files changed, 12 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 -- */ diff --git a/v4l/versions.txt b/v4l/versions.txt index eb3597f76..792419f99 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -29,6 +29,8 @@ SOC_CAMERA_MT9M001 [2.6.23] # Needs field intf_assoc in struct usb_host_config VIDEO_CX231XX +# Some freezer routines +USB_GSPCA_SN9C20X_EVDEV [2.6.22] #This driver requires I2C probe/remove fields |