ARM: OMAP: Undo changes for arch/arm/kernel/arch.c

Needed to avoid merge conflicts

diff --git a/arch/arm/kernel/arch.c b/arch/arm/kernel/arch.c
index c35c8d8..4e02fbe 100644 (file)
--- a/arch/arm/kernel/arch.c
+++ b/arch/arm/kernel/arch.c
@@ -6,7 +6,6 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/types.h>
-#include <linux/string.h>
 
 #include <asm/elf.h>
 #include <asm/page.h>