zwp10758 / rpms / kernel

Forked from rpms/kernel 4 years ago
Clone
f2c60e
From 0eadbb65c0026fb4eec89c54f6b48a0febd87f92 Mon Sep 17 00:00:00 2001
f2c60e
From: Laura Abbott <labbott@redhat.com>
f2c60e
Date: Fri, 9 Sep 2016 08:19:17 -0700
f2c60e
Subject: [PATCH] iio: Use type header from kernel tree
f2c60e
MIME-Version: 1.0
f2c60e
Content-Type: text/plain; charset=UTF-8
f2c60e
Content-Transfer-Encoding: 8bit
f2c60e
To: Jonathan Cameron <jic23@kernel.org>
f2c60e
To: Hartmut Knaack <knaack.h@gmx.de>
f2c60e
To: Lars-Peter Clausen <lars@metafoo.de>
f2c60e
To: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
f2c60e
Cc: linux-iio@vger.kernel.org
f2c60e
Cc: linux-kernel@vger.kernel.org
f2c60e
f2c60e
f2c60e
The iio tools have been updated as new event types have been added to
f2c60e
the kernel. The tools currently use the standard system headers which
f2c60e
means that the system may not have the newest defintitions. This leads
f2c60e
to build failures when building newer tools on older hosts:
f2c60e
f2c60e
gcc -Wall -g -D_GNU_SOURCE   -c -o iio_event_monitor.o
f2c60e
iio_event_monitor.c
f2c60e
iio_event_monitor.c:59:3: error: ‘IIO_UVINDEX’ undeclared here (not in a
f2c60e
function)
f2c60e
  [IIO_UVINDEX] = "uvindex",
f2c60e
   ^~~~~~~~~~~
f2c60e
iio_event_monitor.c:59:3: error: array index in initializer not of
f2c60e
integer type
f2c60e
iio_event_monitor.c:59:3: note: (near initialization for
f2c60e
‘iio_chan_type_name_spec’)
f2c60e
iio_event_monitor.c:97:3: error: ‘IIO_MOD_LIGHT_UV’ undeclared here (not
f2c60e
in a function)
f2c60e
  [IIO_MOD_LIGHT_UV] = "uv",
f2c60e
   ^~~~~~~~~~~~~~~~
f2c60e
iio_event_monitor.c:97:3: error: array index in initializer not of
f2c60e
integer type
f2c60e
iio_event_monitor.c:97:3: note: (near initialization for
f2c60e
‘iio_modifier_names’)
f2c60e
<builtin>: recipe for target 'iio_event_monitor.o' failed
f2c60e
f2c60e
Switch to using the header from the kernel tree to ensure the newest
f2c60e
defintions are always picked up.
f2c60e
f2c60e
Signed-off-by: Laura Abbott <labbott@redhat.com>
f2c60e
---
f2c60e
 tools/iio/iio_event_monitor.c | 2 +-
f2c60e
 1 file changed, 1 insertion(+), 1 deletion(-)
f2c60e
f2c60e
diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
f2c60e
index d9b7e0f..f02523d 100644
f2c60e
--- a/tools/iio/iio_event_monitor.c
f2c60e
+++ b/tools/iio/iio_event_monitor.c
f2c60e
@@ -26,7 +26,7 @@
f2c60e
 #include <sys/ioctl.h>
f2c60e
 #include "iio_utils.h"
f2c60e
 #include <linux/iio/events.h>
f2c60e
-#include <linux/iio/types.h>
f2c60e
+#include "../../include/uapi/linux/iio/types.h"
f2c60e
 
f2c60e
 static const char * const iio_chan_type_name_spec[] = {
f2c60e
 	[IIO_VOLTAGE] = "voltage",
f2c60e
-- 
f2c60e
2.7.4
f2c60e