summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-30 01:14:37 +0400
committerOlof Johansson <olof@lixom.net>2012-09-30 01:14:37 +0400
commit325f06713337928df572d12d65bdaf91f4d53d83 (patch)
treebb3ab5f6aa6fc0b78c763b5477250430b9e511da /arch/arm
parentd5f73cd6e2087fa9dd07fb87838d44c384569ee4 (diff)
parent075954b1a935899865fd3f7b5cddef42b8b6d57e (diff)
downloadlinux-325f06713337928df572d12d65bdaf91f4d53d83.tar.xz
Merge branch 'vt8500/devel' into next/dt
Picked up one more bugfix by Tony Prisk: * vt8500/devel: arm: vt8500: Fixup for missing gpio.h
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-vt8500/vt8500.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 449499354449..587ea950d08b 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -32,7 +32,6 @@
#include <linux/of_platform.h>
#include <mach/restart.h>
-#include <mach/gpio.h>
#include "common.h"