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

2014-09-29 20:49:41 +01:00
parent 18a64d844c 336fb81b31
commit 88507a2ba8
3 changed files with 8 additions and 2 deletions
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -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;