From: Nicolas Kaiser <nikai@nikai.net>

linux/delay.h included twice

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/mfd/ucb1x00-ts.c |    1 -
 1 files changed, 1 deletion(-)

diff -puN drivers/mfd/ucb1x00-ts.c~drivers-mfd-header-included-twice drivers/mfd/ucb1x00-ts.c
--- 25/drivers/mfd/ucb1x00-ts.c~drivers-mfd-header-included-twice	Fri Dec  2 16:28:23 2005
+++ 25-akpm/drivers/mfd/ucb1x00-ts.c	Fri Dec  2 16:28:23 2005
@@ -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>
_