Merge remote-tracking branches 'regmap/topic/rbtree' and 'regmap/topic/update-offload...

[karo-tx-linux.git] / drivers / base / regmap / internal.h

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 628ad7ac078b9b0cbb16cd4720ce1a92ac3f8a82..3250e53473a38957ecd12899612b6acaa5590283 100644 (file)
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -59,6 +59,7 @@ struct regmap {
        regmap_lock lock;
        regmap_unlock unlock;
        void *lock_arg; /* This is passed to lock/unlock functions */
+       gfp_t alloc_flags;
 
        struct device *dev; /* Device we do I/O on */
        void *work_buf;     /* Scratch buffer used to format I/O */