p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2015-02-08 11:16:10 +08:00
parent e36f014edf f93d1be217
commit dfdb3c4d18
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/base/regmap/internal.h
View File

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