diff options
| author | Linus Torvalds <[email protected]> | 2019-03-04 19:16:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-03-04 19:16:09 -0800 |
| commit | e48b044e4ff3788828e5a40e9c36d12e12fbfcf1 (patch) | |
| tree | 23a303e183c0f76506abe043a5171c4c61e3dd23 /drivers/base/regmap/regcache-rbtree.c | |
| parent | 42eaf1851ea2394d1cacf79de075170300d170c3 (diff) | |
| parent | 66fb181d6f824f7695417e8c19560c5b57dc8c2d (diff) | |
Merge tag 'regmap-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"There are only two changes here:
- fix for conflicting attributes on the rbtree node structure
- implementation of main status register support in the interrupt
code which supports chips that have a register to cut down on the
number of per-interrupt status registers that need to be checked
when handling interrupts"
* tag 'regmap-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Remove attribute packed from struct 'regcache_rbtree_node'
regmap: regmap-irq: Add main status register support
Diffstat (limited to 'drivers/base/regmap/regcache-rbtree.c')
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index 2e8f0144f9ab..9cbb4b0cd01b 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c @@ -33,7 +33,7 @@ struct regcache_rbtree_node { unsigned int blklen; /* the actual rbtree node holding this block */ struct rb_node node; -} __attribute__ ((packed)); +}; struct regcache_rbtree_ctx { struct rb_root root; |