diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-29 20:49:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-29 20:49:41 +0100 |
| commit | 88507a2ba8b453a38b950f3ccb2cae6cc4d82e7a (patch) | |
| tree | 87f9a0c7186988e3fd8207f6b3b4d2de3679267f /drivers/base | |
| parent | 18a64d844c0e98ad00f735f5ea6a3affb6b76639 (diff) | |
| parent | 336fb81b319ec4d5c09aa6417de7c042cfcd7461 (diff) | |
| download | linux-88507a2ba8b453a38b950f3ccb2cae6cc4d82e7a.tar.gz | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/base/regmap/internal.h | 6 |
2 files changed, 7 insertions, 2 deletions
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; |