diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 09:34:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-08 09:34:04 -0700 |
| commit | d56290bbc1ad0cf56b25f7cb5859305a486b1bbc (patch) | |
| tree | 49bfc1026a791ccdb24281478e5fe638f381939e /include | |
| parent | Merge tag 'spi-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | Merge remote-tracking branch 'regmap/fix/disable' into regmap-linus (diff) | |
| download | linux-dev-d56290bbc1ad0cf56b25f7cb5859305a486b1bbc.tar.xz linux-dev-d56290bbc1ad0cf56b25f7cb5859305a486b1bbc.zip | |
Merge tag 'regmap-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap fixes from Mark Brown:
"Two things here, one is a fix for a nasty issue where we were failing
to sync the last register in a block when using raw writes and the
other fixes a missing header for the !REGMAP stubs so that we don't
rely on implicit includes in that case"
* tag 'regmap-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Add missing header for !CONFIG_REGMAP stubs
regmap: cache: Make sure to sync the last register in a block
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 75981d0b57dc..580a5320cc96 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -15,6 +15,7 @@ #include <linux/list.h> #include <linux/rbtree.h> +#include <linux/err.h> struct module; struct device; |