diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
| commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
| tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /drivers/base/regmap/internal.h | |
| parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
| parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/base/regmap/internal.h')
| -rw-r--r-- | drivers/base/regmap/internal.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h index 0da5865df5b1..beb8b27d4621 100644 --- 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 */ @@ -233,6 +235,10 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, void regmap_async_complete_cb(struct regmap_async *async, int ret); +enum regmap_endian regmap_get_val_endian(struct device *dev, + const struct regmap_bus *bus, + const struct regmap_config *config); + extern struct regcache_ops regcache_rbtree_ops; extern struct regcache_ops regcache_lzo_ops; extern struct regcache_ops regcache_flat_ops; |