From 26aa7d588d5d6752cc28bfbd5a0c2ef7fce57e46 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 26 Oct 2011 17:41:33 +0100
Subject: [PATCH] --- yaml --- r: 281001 b: refs/heads/master c:
 65d5ff8d519bb9f994f9376a56816d992a5b53ab h: refs/heads/master i:   280999:
 f1c445c29f368de3a7d001f8e7ff26d3373a8903 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/iio/events.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index de8aaf59308d..3bccce48b9c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af5046af1c812839f085030f358a01814666fc80
+refs/heads/master: 65d5ff8d519bb9f994f9376a56816d992a5b53ab
diff --git a/trunk/drivers/staging/iio/events.h b/trunk/drivers/staging/iio/events.h
index 08cf3d1a38bf..389c7810b66b 100644
--- a/trunk/drivers/staging/iio/events.h
+++ b/trunk/drivers/staging/iio/events.h
@@ -10,6 +10,7 @@
 #define _IIO_EVENTS_H_
 
 #include <linux/ioctl.h>
+#include <linux/types.h>
 #include "types.h"
 
 /**
@@ -19,8 +20,8 @@
  *		the interrupt handler)
  */
 struct iio_event_data {
-	u64	id;
-	s64	timestamp;
+	__u64	id;
+	__s64	timestamp;
 };
 
 #define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)