projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[cascardo/linux.git]
/
drivers
/
mfd
/
ucb1x00-ts.c
diff --git
a/drivers/mfd/ucb1x00-ts.c
b/drivers/mfd/ucb1x00-ts.c
index
551061c
..
79fd062
100644
(file)
--- 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>