summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/friendlyarm-mini2440
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-09-05 10:38:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-09-05 10:38:53 +0200
commit8f9d4007c53cefc513619b83b5b81b146423b11b (patch)
tree88242ae77da977fca2a8777936509534bf8f0b45 /arch/arm/boards/friendlyarm-mini2440
parentec102f635b41a7613a034c84e85559b46ed1c1f3 (diff)
parent8c1180c3eda1c4c50ffa31fdd6a764026ce51a65 (diff)
downloadbarebox-8f9d4007c53cefc513619b83b5b81b146423b11b.tar.gz
barebox-8f9d4007c53cefc513619b83b5b81b146423b11b.tar.xz
Merge branch 'for-next/arm-gpio'
Diffstat (limited to 'arch/arm/boards/friendlyarm-mini2440')
-rw-r--r--arch/arm/boards/friendlyarm-mini2440/mini2440.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c
index de07bda755..cf96183100 100644
--- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c
+++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c
@@ -34,7 +34,8 @@
#include <asm/armlinux.h>
#include <asm/sections.h>
#include <io.h>
-#include <mach/gpio.h>
+#include <gpio.h>
+#include <mach/iomux.h>
#include <mach/s3c-iomap.h>
#include <mach/devices-s3c24xx.h>
#include <mach/s3c24xx-nand.h>