commit 44fce35f29a7f2d976d9160bfbc55635b459a6a0
author Nicolas Kaiser <nikai@nikai.net> Sun Jan 08 01:03:37 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Sun Jan 08 20:13:59 2006 -0800
tree 99ea5c540658e8c02945b00041d904474766b968
parent dda6ebde96044e9b5f1b14588659b39b4e6c08e7

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

drivers/mfd/ucb1x00-ts.c

diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 551061c..79fd062 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -32,7 +32,6 @@
 #include <linux/suspend.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
-#include <linux/delay.h>
 
 #include <asm/dma.h>
 #include <asm/semaphore.h>