From 656d5fe7f7da60bba11d080ac1b76953b255a18b Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 28 Jul 2008 18:29:09 +0200
Subject: [PATCH] --- yaml --- r: 106970 b: refs/heads/master c:
 7f71ac9374fec066e428892a68db158946cee1fb h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/mfd/mfd-core.c   | 15 +++++++--------
 trunk/include/linux/mfd/core.h | 17 ++++++++---------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index f985f6f35a4b..59f7e993b067 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ee41993b5b25ee0fbde2d4dcaac1f8c5ef5cc4
+refs/heads/master: 7f71ac9374fec066e428892a68db158946cee1fb
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
index 4dc861a7ac56..50207700140c 100644
--- a/trunk/drivers/mfd/mfd-core.c
+++ b/trunk/drivers/mfd/mfd-core.c
@@ -16,9 +16,9 @@
 #include <linux/mfd/core.h>
 
 static int mfd_add_device(struct platform_device *parent,
-		const struct mfd_cell *cell,
-		struct resource *mem_base,
-		int irq_base)
+			  const struct mfd_cell *cell,
+			  struct resource *mem_base,
+			  int irq_base)
 {
 	struct resource res[cell->num_resources];
 	struct platform_device *pdev;
@@ -75,11 +75,10 @@ static int mfd_add_device(struct platform_device *parent,
 	return ret;
 }
 
-int mfd_add_devices(
-		struct platform_device *parent,
-		const struct mfd_cell *cells, int n_devs,
-		struct resource *mem_base,
-		int irq_base)
+int mfd_add_devices(struct platform_device *parent,
+		    const struct mfd_cell *cells, int n_devs,
+		    struct resource *mem_base,
+		    int irq_base)
 {
 	int i;
 	int ret = 0;
diff --git a/trunk/include/linux/mfd/core.h b/trunk/include/linux/mfd/core.h
index bb3dd0545928..b7cbb9968339 100644
--- a/trunk/include/linux/mfd/core.h
+++ b/trunk/include/linux/mfd/core.h
@@ -1,5 +1,3 @@
-#ifndef MFD_CORE_H
-#define MFD_CORE_H
 /*
  * drivers/mfd/mfd-core.h
  *
@@ -13,6 +11,9 @@
  *
  */
 
+#ifndef MFD_CORE_H
+#define MFD_CORE_H
+
 #include <linux/platform_device.h>
 
 /*
@@ -38,17 +39,15 @@ struct mfd_cell {
 	const struct resource	*resources;
 };
 
-static inline struct mfd_cell *
-mfd_get_cell(struct platform_device *pdev)
+static inline struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
 {
 	return (struct mfd_cell *)pdev->dev.platform_data;
 }
 
-extern int mfd_add_devices(
-		struct platform_device *parent,
-		const struct mfd_cell *cells, int n_devs,
-		struct resource *mem_base,
-		int irq_base);
+extern int mfd_add_devices(struct platform_device *parent,
+			   const struct mfd_cell *cells, int n_devs,
+			   struct resource *mem_base,
+			   int irq_base);
 
 extern void mfd_remove_devices(struct platform_device *parent);