From 54d28ef3943e0c23754120c4d82c2de3de163db7 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 2 Nov 2009 21:57:39 -0800
Subject: [PATCH] --- yaml --- r: 174223 b: refs/heads/master c:
 e74c2e81fc9e1e674f2747c85fe8cfeaaafa55f6 h: refs/heads/master i:   174221:
 b8f3021b0e54542396ce817c45097ca447def4b3   174219:
 c2c5b8b7ab487a2e8ba849575e4cbf9677a585e5   174215:
 cc3ca3ef323fa010777064c3476a4a794695b919   174207:
 75062c8e375e0775a7bc97c8e0d099c3a7f343e8 v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/input.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8a601dc8cd41..a22cd9e30c40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5f523bc0cdee2a163a034344ebf1163799b3c5d
+refs/heads/master: e74c2e81fc9e1e674f2747c85fe8cfeaaafa55f6
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 0ccfc30cd40f..9ee67b4b2b48 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -890,7 +890,7 @@ struct ff_periodic_effect {
 	struct ff_envelope envelope;
 
 	__u32 custom_len;
-	__s16 *custom_data;
+	__s16 __user *custom_data;
 };
 
 /**