summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-rm9200dk.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-21 16:46:26 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-21 16:46:26 +0200
commit335332770c68649ffeaf5dc2b58d9cd40041e295 (patch)
treea48e86b9f9a80913399a182a152b4c580a9c3836 /arch/arm/mach-at91/board-rm9200dk.c
parent3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff)
parentf55be1bf52aad524dc1bf556ae26c90262c87825 (diff)
Merge branch 'depends/rmk/gpio' into next/board
Conflicts: arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-at91/board-usb-a9263.c arch/arm/mach-tegra/board-paz00.h arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'arch/arm/mach-at91/board-rm9200dk.c')
-rw-r--r--arch/arm/mach-at91/board-rm9200dk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index 6f08faadb47..b4ac30e38a9 100644
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -22,6 +22,7 @@
*/
#include <linux/types.h>
+#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/module.h>
@@ -39,7 +40,6 @@
#include <mach/hardware.h>
#include <mach/board.h>
-#include <mach/gpio.h>
#include <mach/at91rm9200_mc.h>
#include "generic.h"