Merge remote-tracking branches 'regmap/topic/ac97', 'regmap/topic/doc' and 'regmap...

diff --combined drivers/base/regmap/internal.h
index 8e94584b0d26077168912a2b78ffc27a6719bcdc,0da5865df5b1b4f092fef5652814e7cc96b8993e,0da5865df5b1b4f092fef5652814e7cc96b8993e,c49a79edae52c66518ab4991300455cf53cecab3..beb8b27d4621a6d9f839065c1296fa8ab67f3032
--- 1/drivers/base/regmap/internal.h
--- 2/drivers/base/regmap/internal.h
--- 3/drivers/base/regmap/internal.h
--- 4/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@@@@ -51,11 -51,9 -51,9 -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 */
@@@@@ -235,6 -233,6 -233,6 -233,10 +235,10 @@@@@ int _regmap_raw_write(struct regmap *ma
    
    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;