From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Mon, 7 Jul 2008 09:09:29 +0000 (+0100)
Subject: [ARM] 5151/1: Tosa: remove double inclusion of linux/delay.h
X-Git-Tag: v2.6.27-rc1~850^2^2~16^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0121702dbaf961b4c996f2579d4286a0a1ed877c;p=linux-2.6

[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>
---

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 5a9d329f50..2d49de572b 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>