diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 21:14:39 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 21:14:39 +0100 |
| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 (patch) | |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 /drivers/video/msm/mddi.c | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 (diff) | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff) | |
Merge branch 'for-linus' into for-2.6.33
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/video/msm/mddi.c')
| -rw-r--r-- | drivers/video/msm/mddi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index f2de5a1acd6..5c5a1ad1d39 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c @@ -27,8 +27,6 @@ #include <mach/msm_iomap.h> #include <mach/irqs.h> #include <mach/board.h> -#include <linux/delay.h> - #include <mach/msm_fb.h> #include "mddi_hw.h" |