--- kernel-source-uvcvideo-1.1/uvc_compat.h~ 2008-03-23 09:37:24 +0200 +++ kernel-source-uvcvideo-1.1/uvc_compat.h~ 2008-05-26 14:54:53 +0300 @@ -143,15 +143,6 @@ /* * V4L2 Control identifiers. */ -#define V4L2_CTRL_CLASS_CAMERA 0x009A0000 /* Camera class controls */ - -#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24) -enum v4l2_power_line_frequency { - V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0, - V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1, - V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2, -}; - #define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) #define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) #define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) @@ -161,12 +152,7 @@ #define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) #define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE+1) -enum v4l2_exposure_auto_type { - V4L2_EXPOSURE_MANUAL = 1, - V4L2_EXPOSURE_AUTO = 2, - V4L2_EXPOSURE_SHUTTER_PRIORITY = 4, - V4L2_EXPOSURE_APERTURE_PRIORITY = 8 -}; + #define V4L2_CID_EXPOSURE_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+2) #define V4L2_CID_EXPOSURE_AUTO_PRIORITY (V4L2_CID_CAMERA_CLASS_BASE+3) --- kernel-source-uvcvideo-1.1/uvc_driver.c~ 2008-03-23 09:37:24 +0200 +++ kernel-source-uvcvideo-1.1/uvc_driver.c~ 2008-05-26 13:59:57 +0300 @@ -40,6 +40,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include +#include #endif #include "uvcvideo.h" --- kernel-source-uvcvideo-1.1/uvc_v4l2.c~ 2008-03-23 09:37:24 +0200 +++ kernel-source-uvcvideo-1.1/uvc_v4l2.c~ 2008-05-26 14:00:53 +0300 @@ -24,6 +24,7 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include +#include #endif #include "uvcvideo.h"