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

dfdb3c4d · Mark Brown · e36f014e · f93d1be2 · dfdb3c4d
Commit dfdb3c4d authored Feb 08, 2015 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

drivers/base/regmap/internal.h drivers/base/regmap/internal.h +4 -2

No files found.
--- 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 */