Merge branch 'sunxi/soc2' into next/soc

Adding one patch to fix build error. * sunxi/soc2: ARM: sunxi: add missing include for mdelay() Signed-off-by: Olof Johansson <olof@lixom.net>
git-mirror · Nov 30, 2012 · 011d309 · 011d309
2 parents 79870b7 + 5e51651
commit 011d309
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
@@ -10,6 +10,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/of_address.h>