diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:15:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:15:29 +0900 |
commit | d63638440cfad75fb339fd1261bea0485c7c3ecc (patch) | |
tree | d1705ceeef82eb0b7b58f9503a472be810f418f2 /arch/arm/mach-at91/board-sam9m10g45ek.c | |
parent | f1e0477a7b7a541f51eea279910eed4ddd010033 (diff) | |
parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-at91/board-sam9m10g45ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9m10g45ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index ad234ccbf57..2d6203ac1a4 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -14,6 +14,7 @@ */ #include <linux/types.h> +#include <linux/gpio.h> #include <linux/init.h> #include <linux/mm.h> #include <linux/module.h> @@ -38,7 +39,6 @@ #include <asm/mach/irq.h> #include <mach/board.h> -#include <mach/gpio.h> #include <mach/at91sam9_smc.h> #include <mach/at91_shdwc.h> #include <mach/system_rev.h> |