diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 23:17:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 23:17:52 +0100 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-s5p6440/gpio.c | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
| download | kernel_samsung_smdk4412-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.gz kernel_samsung_smdk4412-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.bz2 kernel_samsung_smdk4412-0b019a41553a919965bb02d07d54e3e6c57a796d.zip | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5p6440/gpio.c')
| -rw-r--r-- | arch/arm/mach-s5p6440/gpio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6440/gpio.c b/arch/arm/mach-s5p6440/gpio.c index 92efc05b1ba..8bf6e0ce51c 100644 --- a/arch/arm/mach-s5p6440/gpio.c +++ b/arch/arm/mach-s5p6440/gpio.c @@ -13,9 +13,11 @@ #include <linux/kernel.h> #include <linux/irq.h> #include <linux/io.h> +#include <linux/gpio.h> + #include <mach/map.h> -#include <mach/gpio.h> #include <mach/regs-gpio.h> + #include <plat/gpio-core.h> #include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> |