From: Nicolas Kaiser <nikai@nikai.net>
Date: Sun, 8 Jan 2006 09:03:37 +0000 (-0800)
Subject: [PATCH] drivers/mfd: header included twice
X-Git-Tag: v2.6.16-rc1~747
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=44fce35f29a7f2d976d9160bfbc55635b459a6a0;p=linux-2.6-omap-h63xx.git

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

diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 551061c2ead..79fd062ccb3 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>