Merge branch 'master' of ../master into next

[u-boot] / arch / arm / cpu / armv7 / syslib.c

diff --git a/arch/arm/cpu/armv7/syslib.c b/arch/arm/cpu/armv7/syslib.c
index f9ed9a307b7c0142a0e1bce1469c9acc1168906c..84d17f0f21d3bcce4b1a6de35e8d8518bf5d2c84 100644 (file)
--- a/arch/arm/cpu/armv7/syslib.c
+++ b/arch/arm/cpu/armv7/syslib.c
@@ -23,7 +23,6 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/sys_proto.h>
 
 /************************************************************
  * sdelay() - simple spin loop.  Will be constant time as