5ea5f1d756
git-svn-id: svn://svn.openwrt.org/openwrt/packages@30756 3c298f89-4303-0410-b956-a3cf2f4a3e73
33 lines
639 B
Diff
33 lines
639 B
Diff
--- a/backend/v4l.c
|
|
+++ b/backend/v4l.c
|
|
@@ -84,9 +84,8 @@
|
|
#include "../include/sane/sanei_config.h"
|
|
#define V4L_CONFIG_FILE "v4l.conf"
|
|
|
|
-#include "v4l.h"
|
|
-
|
|
#include <libv4l1.h>
|
|
+#include "v4l.h"
|
|
|
|
static const SANE_Device **devlist = NULL;
|
|
static int num_devices;
|
|
--- a/backend/v4l.h
|
|
+++ b/backend/v4l.h
|
|
@@ -29,6 +29,7 @@
|
|
#ifndef v4l_h
|
|
#define v4l_h
|
|
|
|
+#ifndef __LINUX_VIDEODEV_H
|
|
/* Kernel interface */
|
|
/* Only the stuff we need. For more features, more defines are needed */
|
|
|
|
@@ -165,7 +166,7 @@ struct video_channel
|
|
|
|
|
|
/* end of kernel interface */
|
|
-
|
|
+#endif /* !__LINUX_VIDEODEV_H */
|
|
|
|
#include <../include/sane/sane.h>
|
|
|