diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-02-09 13:13:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-02-09 13:13:45 +0100 |
commit | 3c3d7cb1db4af176dab843f22ea092a4ef1eb989 (patch) | |
tree | 9c1b2951432ed10d0654a8e13cbe57b51260d06b /arch/arm/mach-s3c64xx/mach-smdk6410.c | |
parent | 0e9f2204cfa6d79abe3e525ddf7c4ab5792cc751 (diff) | |
parent | 494479038d97f1b9f76fc633a360a681acdf035c (diff) |
Merge branch 'linus' into perf/core
Refresh the branch to a v3.14-rc base before queueing up new devel patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index d5ea938cc9a1..43261d24a0a5 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -57,6 +57,7 @@ #include <plat/regs-serial.h> #include <mach/regs-gpio.h> +#include <mach/gpio-samsung.h> #include <linux/platform_data/ata-samsung_cf.h> #include <linux/platform_data/i2c-s3c2410.h> #include <plat/fb.h> |