diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:16:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:16:43 +0900 |
| commit | d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (patch) | |
| tree | 28e799ec49f72bf37f39d192d21f25bffb682aab /arch/arm/mach-nomadik/cpu-8815.c | |
| parent | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (diff) | |
| parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
| -rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index ac58e3b03b1..dc67717db6f 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -21,8 +21,8 @@ #include <linux/device.h> #include <linux/amba/bus.h> #include <linux/platform_device.h> -#include <linux/gpio.h> +#include <plat/gpio-nomadik.h> #include <mach/hardware.h> #include <mach/irqs.h> #include <asm/mach/map.h> |