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.