rpms/kernel/devel linux-2.6-videodev-v4l1.patch, NONE, 1.1 kernel-2.6.spec, 1.2593, 1.2594

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12831

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-videodev-v4l1.patch 
Log Message:
fix videodev.h header for userspace

linux-2.6-videodev-v4l1.patch:
 videodev.h |    5 -----
 1 files changed, 5 deletions(-)

--- NEW FILE linux-2.6-videodev-v4l1.patch ---
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 518c7a3..412c811 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -14,9 +14,6 @@ #define __LINUX_VIDEODEV_H
 
 #include <linux/videodev2.h>
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#define HAVE_V4L1 1
-
 struct video_capability
 {
 	char name[32];
@@ -337,8 +334,6 @@ #define VID_HARDWARE_SAA7114H   37
 #define VID_HARDWARE_SN9C102	38
 #define VID_HARDWARE_ARV	39
 
-#endif /* CONFIG_VIDEO_V4L1_COMPAT */
-
 #endif /* __LINUX_VIDEODEV_H */
 
 /*


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2593
retrieving revision 1.2594
diff -u -r1.2593 -r1.2594
--- kernel-2.6.spec	25 Aug 2006 21:32:17 -0000	1.2593
+++ kernel-2.6.spec	27 Aug 2006 21:51:51 -0000	1.2594
@@ -452,6 +452,7 @@
 Patch1780: linux-2.6-ehea-ethernet-driver.patch
 Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch
 Patch1791: linux-2.6-libertas.diff
+Patch1792: linux-2.6-videodev-v4l1.patch
 
 # SELinux/audit patches.
 Patch1801: linux-2.6-selinux-mprotect-checks.patch
@@ -1009,6 +1010,9 @@
 %patch1791 -p1
 %endif
 
+# Fix <linux/videodev.h> to include V4L1 stuff
+%patch1792 -p1
+
 # Fix the SELinux mprotect checks on executable mappings
 %patch1801 -p1
 # Add support for SELinux range transitions
@@ -1800,6 +1804,9 @@
 %endif
 
 %changelog
+* Sun Aug 27 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix V4L1 stuff in <linux/videodev.h> (#204225)
+
 * Fri Aug 25 2006 Juan Quintela <quintela at redhat.com>
 - update xen HV to xen-unstable cset 11251.
 - fix ia64 xen HV compilation.