Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 44fce35f29a7f2d976d9160bfbc55635b459a6a0

Authored by Nicolas Kaiser
Committed by Linus Torvalds
1 parent dda6ebde96
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 1 changed file with 0 additions and 1 deletions Side-by-side Diff

drivers/mfd/ucb1x00-ts.c
Diff comments   View file @ 44fce35
... ... @@ -32,7 +32,6 @@
32 32 #include <linux/suspend.h>
33 33 #include <linux/slab.h>
34 34 #include <linux/kthread.h>
35   -#include <linux/delay.h>
36 35  
37 36 #include <asm/dma.h>
38 37 #include <asm/semaphore.h>