[patch] multimedia_class_device.c compile fix for debian

[Sjoerd Simons]

Hi,

  From multimedia_class_device.c:
    /* Red Hat doesn't have v4l2 headers, just copy that in
       until we find a better solution */

  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. Patch attached

  The multimedia device stuff works fine for my bttv[0] and philips webcam
  (after hacking the driver to  publish device info in sysfs)

    Sjoerd
0: http://luon.net/~sjoerd/hal/hal-bttv.png
-- 
What is mind?  No matter.  What is matter?  Never mind.
		-- Thomas Hewitt Key, 1799-1875
-------------- next part --------------
Index: hald/linux/multimedia_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/multimedia_class_device.c,v
retrieving revision 1.1
diff -u -r1.1 multimedia_class_device.c
--- hald/linux/multimedia_class_device.c	13 Sep 2004 15:45:01 -0000	1.1
+++ hald/linux/multimedia_class_device.c	14 Sep 2004 13:47:41 -0000
@@ -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,
-------------- next part --------------
_______________________________________________
hal mailing list
hal at freedesktop.org
http://freedesktop.org/mailman/listinfo/hal