Merge branch 'vt8500/devel' into next/dt

Picked up one more bugfix by Tony Prisk: * vt8500/devel: arm: vt8500: Fixup for missing gpio.h

Merge branch 'vt8500/devel' into next/dt
Picked up one more bugfix by Tony Prisk: * vt8500/devel: arm: vt8500: Fixup for missing gpio.h
325f0671 · Olof Johansson · d5f73cd6 · 075954b1 · 325f0671
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

arch/arm/mach-vt8500/vt8500.c arch/arm/mach-vt8500/vt8500.c +0 -1

未找到文件。
--- 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"