summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2006-01-08 01:03:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:13:59 -0800
commit44fce35f29a7f2d976d9160bfbc55635b459a6a0 (patch)
tree99ea5c540658e8c02945b00041d904474766b968
parentdda6ebde96044e9b5f1b14588659b39b4e6c08e7 (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>
-rw-r--r--drivers/mfd/ucb1x00-ts.c1
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 @@
#include <linux/suspend.h>
#include <linux/slab.h>
#include <linux/kthread.h>
-#include <linux/delay.h>
#include <asm/dma.h>
#include <asm/semaphore.h>