summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-08 11:16:10 +0800
committerMark Brown <broonie@kernel.org>2015-02-08 11:16:10 +0800
commitdfdb3c4d18221c5c66a1bfecb76c25b3f95275e8 (patch)
treeaa5ba637239f5dea2313afd72c586d5489d973a1 /drivers
parente36f014edff70fc02b3d3d79cead1d58f289332e (diff)
parentf93d1be217d89f258f0108a8cd64b98cb8fa9e73 (diff)
downloadlinux-dfdb3c4d18221c5c66a1bfecb76c25b3f95275e8.tar.bz2
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/regmap/internal.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 0da5865df5b1..8e94584b0d26 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -51,9 +51,11 @@ struct regmap_async {
struct regmap {
union {
struct mutex mutex;
- spinlock_t spinlock;
+ struct {
+ spinlock_t spinlock;
+ unsigned long spinlock_flags;
+ };
};
- unsigned long spinlock_flags;
regmap_lock lock;
regmap_unlock unlock;
void *lock_arg; /* This is passed to lock/unlock functions */