From ecab4693e214ecf8c908739fc353f311cc587a72 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Mon, 29 Nov 2010 15:47:09 -0500
Subject: [PATCH] --- yaml --- r: 227807 b: refs/heads/master c:
 c41ab6a1b9028de33e74101cb0aae13098a56fdb h: refs/heads/master i:   227805:
 b93d6ea4ea7c0329797ee2396ac122bb8b5d5d16   227803:
 811d68d5f89604d5b2460f628a7f381e523af1ff   227799:
 a1ce2bd7664fb621b8aaa8d72495db986fec4a4e   227791:
 5f3a3914ee68fb5de1f0e1c6aecb5f214ca0341d   227775:
 f64e3aea0160316bd4cd6f6f7e173fd0613ca7eb v: v3

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

diff --git a/[refs] b/[refs]
index 709de0df39eb..f4ed3083c9b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9e86a9b95f198d7df49b25fcd808ee39cba218f
+refs/heads/master: c41ab6a1b9028de33e74101cb0aae13098a56fdb
diff --git a/trunk/include/linux/flex_array.h b/trunk/include/linux/flex_array.h
index 631b77f2ac70..70e4efabe0fb 100644
--- a/trunk/include/linux/flex_array.h
+++ b/trunk/include/linux/flex_array.h
@@ -71,7 +71,7 @@ void *flex_array_get(struct flex_array *fa, unsigned int element_nr);
 int flex_array_shrink(struct flex_array *fa);
 
 #define flex_array_put_ptr(fa, nr, src, gfp) \
-	flex_array_put(fa, nr, &(void *)(src), gfp)
+	flex_array_put(fa, nr, (void *)&(src), gfp)
 
 void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr);