Merge remote-tracking branch 'regmap/topic/core' into regmap-next

88507a2b · Mark Brown · 18a64d84 · 336fb81b · 88507a2b · 88507a2b
Commit 88507a2b authored Sep 29, 2014 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

MAINTAINERS MAINTAINERS +1 -0

drivers/base/regmap/Kconfig drivers/base/regmap/Kconfig +3 -0

drivers/base/regmap/internal.h drivers/base/regmap/internal.h +4 -2

No files found.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7596,6 +7596,7 @@ F:	fs/reiserfs/
 REGISTER MAP ABSTRACTION
 M:	Mark Brown <broonie@kernel.org>
+L:	linux-kernel@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
 S:	Supported
 F:	drivers/base/regmap/

--- a/drivers/base/regmap/Kconfig
+++ b/drivers/base/regmap/Kconfig
@@ -11,12 +11,15 @@ config REGMAP
 config REGMAP_I2C
 	tristate
+	depends on I2C
 config REGMAP_SPI
 	tristate
+	depends on SPI
 config REGMAP_SPMI
 	tristate
+	depends on SPMI
 config REGMAP_MMIO
 	tristate

--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -49,8 +49,10 @@ struct regmap_async {
 };
 struct regmap {
+	union {
 		struct mutex mutex;
 		spinlock_t spinlock;
+	};
 	unsigned long spinlock_flags;
 	regmap_lock lock;
 	regmap_unlock unlock;