[PATCH] regmap: Fix build by removing extra parameter from regmap_debugfs_init()

[PATCH] regmap: Fix build by removing extra parameter from regmap_debugfs_init()

[Fabio Estevam]

commit b4eb511 (Merge branches 'regmap-mmio', 'regmap-naming' and 'regmap-linus' into regmap-next)
added an extra paramter to the prototype of regmap_debugfs_init() in the case of !CONFIG_DEBUG_FS.

Remove this extra parameter so that the driver can build again when !CONFIG_DEBUG_FS.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
This applies against linux-next

 drivers/base/regmap/internal.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 32c2947..e46c279 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -112,7 +112,7 @@ extern void regmap_debugfs_init(struct regmap *map);
 extern void regmap_debugfs_exit(struct regmap *map);
 #else
 static inline void regmap_debugfs_initcall(void) { }
-static inline void regmap_debugfs_init(struct regmap *map, const char *name) { }
+static inline void regmap_debugfs_init(struct regmap *map) { }
 static inline void regmap_debugfs_exit(struct regmap *map) { }
 #endif
 
-- 
1.7.1

Re: [PATCH] regmap: Fix build by removing extra parameter from regmap_debugfs_init()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

On Tue, Apr 10, 2012 at 08:29:06PM -0300, Fabio Estevam wrote:
> commit b4eb511 (Merge branches 'regmap-mmio', 'regmap-naming' and 'regmap-linus' into regmap-next)
> added an extra paramter to the prototype of regmap_debugfs_init() in the case of !CONFIG_DEBUG_FS.

No it doesn't.  Some commit on one of the branches that got merged adds
the parameter, and this was already fixed on that branch.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]