summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2012-03-09 13:17:28 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-11 12:52:44 +0000
commitf5d6eba74b8aac7d4bf646c5445807aa6a247e6c (patch)
tree8fe6aafeca1e69ce782eaf9fe71a20fdc5bb9d92 /drivers/base
parentb83d2ff01376cf3799394693c0dd089f657bdf84 (diff)
downloadlinux-3.10-f5d6eba74b8aac7d4bf646c5445807aa6a247e6c.tar.gz
linux-3.10-f5d6eba74b8aac7d4bf646c5445807aa6a247e6c.tar.bz2
linux-3.10-f5d6eba74b8aac7d4bf646c5445807aa6a247e6c.zip
regmap: Fix future missing prototype of devres_alloc() and friends
[Fix for breakage which will be introduced during the merge window via header reworks in another tree, the regmap tree does include device.h but Paul's tree breaks that. Reworded subject to reflect -- broonie] regmap.s uses devres_alloc() and others that are prototyped in device.h. Include that to solve the following: drivers/base/regmap/regmap.c: In function 'devm_regmap_init': drivers/base/regmap/regmap.c:331:2: error: implicit declaration of function 'devres_alloc' [-Werror=implicit-function-declaration] drivers/base/regmap/regmap.c:338:3: error: implicit declaration of function 'devres_add' [-Werror=implicit-function-declaration] drivers/base/regmap/regmap.c:340:3: error: implicit declaration of function 'devres_free' [-Werror=implicit-function-declaration] drivers/base/regmap/regmap.c: In function '_regmap_raw_write': drivers/base/regmap/regmap.c:421:5: error: implicit declaration of function 'dev_err' [-Werror=implicit-function-declaration] Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index b47f19146ee..253882d8392 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -10,6 +10,7 @@
* published by the Free Software Foundation.
*/
+#include <linux/device.h>
#include <linux/slab.h>
#include <linux/export.h>
#include <linux/mutex.h>