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

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 */