summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-07-07 10:09:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-07 13:22:13 +0100
commit0121702dbaf961b4c996f2579d4286a0a1ed877c (patch)
tree533878949830d75e71f0d476cf50f635de6ce8dd /arch
parent16b32fd0a35b30cbd67395cfcbd360354db44f39 (diff)
downloadlinux-0121702dbaf961b4c996f2579d4286a0a1ed877c.tar.gz
linux-0121702dbaf961b4c996f2579d4286a0a1ed877c.tar.bz2
linux-0121702dbaf961b4c996f2579d4286a0a1ed877c.zip
[ARM] 5151/1: Tosa: remove double inclusion of linux/delay.h
The patch applies to the linux-next tree. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/tosa.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 5a9d329f5045..2d49de572ba1 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -26,7 +26,6 @@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <linux/pm.h>
-#include <linux/delay.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/gpio.h>