Merge branch 'vt8500/devel' into next/dt

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

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"