3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Mateusz Krawczuk <m.krawc...@partner.samsung.com>

[ Upstream commit 49ccc142f9cbc33fdda18e8fa90c1c5b4a79c0ad ]

regmap.h requires linux/err.h if CONFIG_REGMAP is not defined. Without it I get
error.
CC      drivers/media/platform/exynos4-is/fimc-reg.o
In file included from drivers/media/platform/exynos4-is/fimc-reg.c:14:0:
include/linux/regmap.h: In function ‘regmap_write’:
include/linux/regmap.h:525:10: error: ‘EINVAL’ undeclared (first use in 
this function)
include/linux/regmap.h:525:10: note: each undeclared identifier is reported 
only once for each function it appears in

Signed-off-by: Mateusz Krawczuk <m.krawc...@partner.samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
Signed-off-by: Mark Brown <broo...@linaro.org>
Cc: sta...@kernel.org
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
 include/linux/regmap.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 7f7e00d..519d5f2 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;
-- 
1.7.10.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to