summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2014-01-15 10:01:29 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-01-15 13:48:06 +0100
commit785acec3eecf4c21bab9e24afb5d354b57a72e03 (patch)
tree3b883a9345ce35bc06349f39750ea89bd7e76852 /drivers/gpio
parentgpio: pxa: clamp gpio get value to [0,1] (diff)
downloadlinux-785acec3eecf4c21bab9e24afb5d354b57a72e03.tar.xz
linux-785acec3eecf4c21bab9e24afb5d354b57a72e03.zip
ARM: S5P[v210|c100|64x0]: Fix build error
gpio-samsung.h header file introduced by commit 93177be0910c ("ARM: S3C[24|64]xx: move includes back under <mach/> scope") is required only by S3C[24|64]xx machines. Include them conditionally to avoid the following build errors for other machine configurations. drivers/gpio/gpio-samsung.c:35:31: fatal error: mach/gpio-samsung.h: No such file or directory arch/arm/plat-samsung/pm-gpio.c:22:31: fatal error: mach/gpio-samsung.h: No such file or directory Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-samsung.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 9741cce11df5..a85e00bf9834 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -32,7 +32,10 @@
#include <mach/map.h>
#include <mach/regs-gpio.h>
+
+#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
#include <mach/gpio-samsung.h>
+#endif
#include <plat/cpu.h>
#include <plat/gpio-core.h>