korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: S5P[v210|c100|64x0]: Fix build error

Browse Source 
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>
This commit is contained in:
Sachin Kamat 2014-01-15 14:31:29 +05:30 committed by Linus Walleij
parent 3018fd8131
commit 785acec3ee
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/plat-samsung/pm-gpio.c
View File

@ -19,7 +19,10 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
#endif
#include <plat/gpio-core.h> #include <plat/gpio-core.h>
#include <plat/pm.h> #include <plat/pm.h>

3
drivers/gpio/gpio-samsung.c
View File

@ -32,7 +32,10 @@
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
#include <mach/gpio-samsung.h> #include <mach/gpio-samsung.h>
#endif
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/gpio-core.h> #include <plat/gpio-core.h>