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

This commit is contained in:
Mark Brown
2014-09-29 20:49:41 +01:00
3 changed files with 8 additions and 2 deletions

View File

@@ -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

View File

@@ -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;