hal/hald/linux multimedia_class_device.c,1.1,1.2

[Kay Sievers]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv21001/hald/linux

Modified Files:
	multimedia_class_device.c 
Log Message:
2004-09-14  Kay Sievers  <kay.sievers at vrfy.org>

        Patch from: Sjoerd Simons <sjoerd at luon.net>

        * hald/linux/multimedia_class_device.c:
        Debian does have the v4l2 stuff in the kernel headers. So just
        copying causes the compile to fail on my system. Luckily it
        defines HAVE_V4L2, so we can check for that.



Index: multimedia_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/multimedia_class_device.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- multimedia_class_device.c	13 Sep 2004 15:45:01 -0000	1.1
+++ multimedia_class_device.c	14 Sep 2004 15:15:46 -0000	1.2
@@ -87,6 +87,7 @@
  *                        instance
  */
 
+#ifndef HAVE_V4L2
 /* Red Hat doesn't have v4l2 headers, just copy that in
    until we find a better solution */
 #define VIDIOC_QUERYCAP			_IOR  ('V',  0, struct v4l2_capability)
@@ -104,6 +105,8 @@
 		__u32	reserved[4];
 } __attribute__((__packed__)) v2cap;
 
+#endif /* HAVE_V4L2 */
+
 static void
 multimedia_class_pre_process (ClassDeviceHandler *self,
 			   HalDevice *d,