From bc45669fa82f3c3164cce5ce477f40c4ed32837e Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 25 Jul 2008 01:45:22 -0700
Subject: [PATCH] --- yaml --- r: 105780 b: refs/heads/master c:
 c82dd5321cf779f1f536ef26b383cbe8c9de7f10 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/mfd-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e31e1f661d94..8254d179d607 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d6f4a20cc287a8980c6186624834cf10a70752b
+refs/heads/master: c82dd5321cf779f1f536ef26b383cbe8c9de7f10
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
index d7d88ce053a6..0454be4266c1 100644
--- a/trunk/drivers/mfd/mfd-core.c
+++ b/trunk/drivers/mfd/mfd-core.c
@@ -36,7 +36,7 @@ static int mfd_add_device(struct platform_device *parent,
 	if (ret)
 		goto fail_device;
 
-	memzero(res, sizeof(res));
+	memset(res, 0, sizeof(res));
 	for (r = 0; r < cell->num_resources; r++) {
 		res[r].name = cell->resources[r].name;
 		res[r].flags = cell->resources[r].flags;