Commit dfdb3c4d authored by Mark Brown's avatar Mark Brown
Browse files

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

parents e36f014e f93d1be2
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -51,9 +51,11 @@ struct regmap_async {
struct regmap {
	union {
		struct mutex mutex;
		struct {
			spinlock_t spinlock;
	};
			unsigned long spinlock_flags;
		};
	};
	regmap_lock lock;
	regmap_unlock unlock;
	void *lock_arg; /* This is passed to lock/unlock functions */