diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
| commit | edc72786d208e77db94f84dcb0d166c0d23d82f7 (patch) | |
| tree | 6fd32770f9cb2f1a888775514294d60aecba5245 /drivers/video/msm/mddi.c | |
| parent | 6a5e293f1b34920c69a932ce37b4a4714a428dc7 (diff) | |
| parent | 4367216a099b4df3fa2c4f2b086cda1a1e9afc4e (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 f2de5a1acd6d..5c5a1ad1d397 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | #include <mach/msm_iomap.h> | 27 | #include <mach/msm_iomap.h> |
| 28 | #include <mach/irqs.h> | 28 | #include <mach/irqs.h> |
| 29 | #include <mach/board.h> | 29 | #include <mach/board.h> |
| 30 | #include <linux/delay.h> | ||
| 31 | |||
| 32 | #include <mach/msm_fb.h> | 30 | #include <mach/msm_fb.h> |
| 33 | #include "mddi_hw.h" | 31 | #include "mddi_hw.h" |
| 34 | 32 | ||