From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 13:25:31 +0000 (-0700)
Subject: ARM: OMAP: Undo changes for arch/arm/kernel/arch.c
X-Git-Tag: v2.6.13-omap1~106
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=89748e09e1d33b401b8ba2b9667d28dc47b25f4c;p=linux-2.6-omap-h63xx.git

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 c35c8d81b67..4e02fbeb10a 100644
--- 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>