diff options
author | Nicolas Kaiser <nikai@nikai.net> | 2006-01-08 04:03:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:59 -0500 |
commit | 44fce35f29a7f2d976d9160bfbc55635b459a6a0 (patch) | |
tree | 99ea5c540658e8c02945b00041d904474766b968 /drivers | |
parent | dda6ebde96044e9b5f1b14588659b39b4e6c08e7 (diff) |
[PATCH] drivers/mfd: header included twice
linux/delay.h included twice
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/ucb1x00-ts.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 551061c2eadf..79fd062ccb34 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/suspend.h> | 32 | #include <linux/suspend.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/kthread.h> | 34 | #include <linux/kthread.h> |
35 | #include <linux/delay.h> | ||
36 | 35 | ||
37 | #include <asm/dma.h> | 36 | #include <asm/dma.h> |
38 | #include <asm/semaphore.h> | 37 | #include <asm/semaphore.h> |