Merge remote-tracking branches 'regmap/topic/ac97', 'regmap/topic/doc' and 'regmap...

[karo-tx-linux.git] / drivers / base / regmap / internal.h

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index c49a79edae52c66518ab4991300455cf53cecab3..beb8b27d4621a6d9f839065c1296fa8ab67f3032 100644 (file)
--- 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 */