rpms/kernel/devel linux-2.6-videodev2-userspace-usage.patch, NONE, 1.1 kernel.spec, 1.841, 1.842

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21175

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-videodev2-userspace-usage.patch 
Log Message:
* Mon Aug 04 2008 Hans de Goede <j.w.r.degoede at hhs.nl>
- fix broken /usr/include/linux/videodev2.h (bz 457688)


linux-2.6-videodev2-userspace-usage.patch:

--- NEW FILE linux-2.6-videodev2-userspace-usage.patch ---
diff -up linux-2.6.26.noarch/include/linux/videodev2.h~ linux-2.6.26.noarch/include/linux/videodev2.h
--- linux-2.6.26.noarch/include/linux/videodev2.h~	2008-08-04 19:49:38.000000000 +0200
+++ linux-2.6.26.noarch/include/linux/videodev2.h	2008-08-04 19:49:38.000000000 +0200
@@ -59,7 +59,6 @@
 #include <linux/time.h>     /* need struct timeval */
 #include <linux/compiler.h> /* need __user */
 #else
-#define __user
 #include <sys/time.h>
 #endif
 #include <linux/ioctl.h>


Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- kernel.spec	4 Aug 2008 17:29:35 -0000	1.841
+++ kernel.spec	4 Aug 2008 18:25:33 -0000	1.842
@@ -623,6 +623,9 @@
 # get rid of imacfb and make efifb work everywhere it was used
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
+# temporary (I hope, reported upstream) fix userspace use of videodev2.h
+Patch2700: linux-2.6-videodev2-userspace-usage.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1144,6 +1147,9 @@
 # get rid of imacfb and make efifb work everywhere it was used
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
+# temporary (I hope, reported upstream) fix userspace use of videodev2.h
+ApplyPatch linux-2.6-videodev2-userspace-usage.patch
+
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
@@ -1715,6 +1721,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 04 2008 Hans de Goede <j.w.r.degoede at hhs.nl>
+- fix broken /usr/include/linux/videodev2.h (bz 457688)
+
 * Mon Aug 04 2008 Matthew Garrett <mjg at redhat.com>
 - update eeepc-laptop driver (#441454)