From afa0af4775d029921eaa2e4f692c93c7cad0d7e1 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 4 May 2010 16:00:02 -0700
Subject: [PATCH] --- yaml --- r: 197236 b: refs/heads/master c:
 30162d690c3539594b6dcebd677c985c6a74249e h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/comedi/comedi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2d5e5dd0427..39732b2d401a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6610944a91079a4002da310d3d5488feaae4a74a
+refs/heads/master: 30162d690c3539594b6dcebd677c985c6a74249e
diff --git a/trunk/drivers/staging/comedi/comedi.h b/trunk/drivers/staging/comedi/comedi.h
index 45272d8bf972..8e4caaacfc1c 100644
--- a/trunk/drivers/staging/comedi/comedi.h
+++ b/trunk/drivers/staging/comedi/comedi.h
@@ -354,7 +354,7 @@
 		unsigned int __user *chanlist;	/* channel/range list */
 		unsigned int chanlist_len;
 
-		short *data;	/* data list, size depends on subd flags */
+		short __user *data;	/* data list, size depends on subd flags */
 		unsigned int data_len;
 	};