summaryrefslogtreecommitdiff
path: root/arch/blackfin/mach-bf537/boards/cm_bf537e.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-08-06 05:57:18 +0400
committerDavid S. Miller <davem@davemloft.net>2014-08-06 05:57:18 +0400
commite9011d086674caeedb0ffb6eb5b8bc5920821df3 (patch)
treeed5d06353d8dc1fa5f6da349808f8345ca2291a5 /arch/blackfin/mach-bf537/boards/cm_bf537e.c
parentcfcfe22256d5a8a14924a1145d56017b043b554f (diff)
parentc78f77e20d2ba5d4d5e478e85a6fb42556893e2d (diff)
downloadlinux-e9011d086674caeedb0ffb6eb5b8bc5920821df3.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Conflicts: arch/sparc/mm/init_64.c Conflict was simple non-overlapping additions. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/cm_bf537e.c')
-rw-r--r--arch/blackfin/mach-bf537/boards/cm_bf537e.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index c65c6dbda3da..1e7290ef3525 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -21,6 +21,7 @@
#endif
#include <linux/ata_platform.h>
#include <linux/irq.h>
+#include <linux/gpio.h>
#include <asm/dma.h>
#include <asm/bfin5xx_spi.h>
#include <asm/portmux.h>