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

3 files changed, 8 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 37054306dc9f..c2f75a90a398 100644
--- 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/
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig
index 4251570610c9..8a3f51f7b1b9 100644
--- 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
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index bfc90b8547f2..0da5865df5b1 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -49,8 +49,10 @@ struct regmap_async {
 };
 
 struct regmap {
-        struct mutex mutex;
-        spinlock_t spinlock;
+        union {
+                struct mutex mutex;
+                spinlock_t spinlock;
+        };
         unsigned long spinlock_flags;
         regmap_lock lock;
         regmap_unlock unlock;