summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/tavorevb.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-06 09:09:16 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-03-06 09:09:16 +0100
commitd282e4d9353b9e7971713aa9e78da716e4a1262d (patch)
tree123aa2391841f37f4b8ae80c02eda4094e17994a /arch/arm/mach-mmp/tavorevb.c
parentMerge pull request #1 from bernieplug/fbdev-next (diff)
parentLinux 3.3-rc6 (diff)
downloadlinux-d282e4d9353b9e7971713aa9e78da716e4a1262d.tar.xz
linux-d282e4d9353b9e7971713aa9e78da716e4a1262d.zip
Merge commit 'v3.3-rc6' into fbdev-next
Diffstat (limited to 'arch/arm/mach-mmp/tavorevb.c')
-rw-r--r--arch/arm/mach-mmp/tavorevb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c
index 8e3b5af04a57..bc97170125bf 100644
--- a/arch/arm/mach-mmp/tavorevb.c
+++ b/arch/arm/mach-mmp/tavorevb.c
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/smc91x.h>
-#include <linux/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>