diff options
| author | Linus Torvalds | 2013-08-27 10:10:30 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-08-27 10:10:30 -0700 |
| commit | fa8218def1b1a16f0a410e2c1c767b4738cc81fa (patch) | |
| tree | c013ffb9ec56789d96e1d9db1f198275ba6e03bd /include | |
| parent | 0c6b5c5b45c258e4aca65df8c5746838668fd99f (diff) | |
| parent | 7f242bd889f49f5447bc4fd1eb5e437159e905b6 (diff) | |
Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap fixes from Mark Brown:
"Two changes here:
- Fix a bug in the rbtree code which could cause it to create two
different cache entries for the same register by adding a single
register at a time to the cache. This isn't awesome for
performance but it's non-invasive which we need for this late in
the release cycle and the I/O costs we're trying to avoid are high.
- Add another header used in the !CONFIG_REGMAP stubs where we had
been relying on implicit inclusion"
* tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: rbtree: Fix overlapping rbnodes.
regmap: Add another missing header for !CONFIG_REGMAP stubs
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 580a5320cc96..6d91fcb4c5cb 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -16,6 +16,7 @@ #include <linux/list.h> #include <linux/rbtree.h> #include <linux/err.h> +#include <linux/bug.h> struct module; struct device; |