]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Undo changes for arch/arm/kernel/arch.c
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 13:25:31 +0000 (06:25 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2005 13:25:31 +0000 (06:25 -0700)
Needed to avoid merge conflicts

arch/arm/kernel/arch.c

index c35c8d81b67df9bddfee0c0b8f9df2132bcb5be3..4e02fbeb10a6cd5a6feb399d520565b8e95986e4 100644 (file)
@@ -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>