linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] regmap: fix compilation when !CONFIG_DEBUG_FS
@ 2012-04-06  5:09 Stephen Warren
  2012-04-06  9:18 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Warren @ 2012-04-06  5:09 UTC (permalink / raw)
  To: Mark Brown; +Cc: linux-kernel, paul.gortmaker, linux-next, Stephen Warren

From: Stephen Warren <swarren@nvidia.com>

Commit 79c64d5 "regmap: allow regmap instances to be named" changed the
prototype of regmap_debugfs_init, but didn't update the dummy inline used
when !CONFIG_DEBUGFS. Fix this.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 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 9bc1d27..99b28ff 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -116,7 +116,7 @@ extern void regmap_debugfs_init(struct regmap *map, const char *name);
 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) { }
+static inline void regmap_debugfs_init(struct regmap *map, const char *name) { }
 static inline void regmap_debugfs_exit(struct regmap *map) { }
 #endif
 
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] regmap: fix compilation when !CONFIG_DEBUG_FS
  2012-04-06  5:09 [PATCH] regmap: fix compilation when !CONFIG_DEBUG_FS Stephen Warren
@ 2012-04-06  9:18 ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2012-04-06  9:18 UTC (permalink / raw)
  To: Stephen Warren; +Cc: linux-kernel, paul.gortmaker, linux-next, Stephen Warren

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

On Thu, Apr 05, 2012 at 11:09:20PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 79c64d5 "regmap: allow regmap instances to be named" changed the
> prototype of regmap_debugfs_init, but didn't update the dummy inline used
> when !CONFIG_DEBUGFS. Fix this.

Applied, thanks.

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-06  9:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-06  5:09 [PATCH] regmap: fix compilation when !CONFIG_DEBUG_FS Stephen Warren
2012-04-06  9:18 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).