[kernel] r11924 - dists/sid/linux-2.6/debian/patches/debian

[Maximilian Attems]

Author: maks
Date: Wed Jul 30 08:03:00 2008
New Revision: 11924

Log:
fix userspace compat patch for x86

no need to redefine V4L2_CID_SHARPNESS,
see e723ee00893f242cbccf5ef2faffdaa6afb8f244 and already
defined in include/linux/videodev2.h

meye.h is userspace exported, but those defines are marked:
/* V4L2 private controls */

Modified:
   dists/sid/linux-2.6/debian/patches/debian/include-userspace-compat.patch

Modified: dists/sid/linux-2.6/debian/patches/debian/include-userspace-compat.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/include-userspace-compat.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/debian/include-userspace-compat.patch	Wed Jul 30 08:03:00 2008
@@ -210,18 +210,6 @@
 +
 +#endif
 +
-diff --git a/include/linux/meye.h b/include/linux/meye.h
-index 12010ac..cb63106 100644
---- a/include/linux/meye.h
-+++ b/include/linux/meye.h
-@@ -59,6 +59,7 @@ struct meye_params {
- /* V4L2 private controls */
- #define V4L2_CID_AGC		V4L2_CID_PRIVATE_BASE
- #define V4L2_CID_MEYE_SHARPNESS	(V4L2_CID_PRIVATE_BASE + 1)
-+#define V4L2_CID_SHARPNESS	V4L2_CID_MEYE_SHARPNESS
- #define V4L2_CID_PICTURE	(V4L2_CID_PRIVATE_BASE + 2)
- #define V4L2_CID_JPEGQUAL	(V4L2_CID_PRIVATE_BASE + 3)
- #define V4L2_CID_FRAMERATE	(V4L2_CID_PRIVATE_BASE + 4)
 diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
 index 81cd36b..04b620a 100644
 --- a/include/linux/msdos_fs.h