diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-07-07 05:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-07 08:22:13 -0400 |
| commit | 0121702dbaf961b4c996f2579d4286a0a1ed877c (patch) | |
| tree | 533878949830d75e71f0d476cf50f635de6ce8dd | |
| parent | 16b32fd0a35b30cbd67395cfcbd360354db44f39 (diff) | |
[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>
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 1 |
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 @@ | |||
| 26 | #include <linux/mtd/nand.h> | 26 | #include <linux/mtd/nand.h> |
| 27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
| 28 | #include <linux/pm.h> | 28 | #include <linux/pm.h> |
| 29 | #include <linux/delay.h> | ||
| 30 | #include <linux/gpio_keys.h> | 29 | #include <linux/gpio_keys.h> |
| 31 | #include <linux/input.h> | 30 | #include <linux/input.h> |
| 32 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |