Commit 325f0671 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'vt8500/devel' into next/dt 

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

arch/arm/mach-vt8500/vt8500.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/of_platform.h>



#include <mach/restart.h>

#include <mach/gpio.h>



#include "common.h"