diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/video/msm/mddi.c | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/video/msm/mddi.c')
| -rw-r--r-- | drivers/video/msm/mddi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index 5c5a1ad1d397..474421fe79a6 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
| 25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/sched.h> | ||
| 27 | #include <mach/msm_iomap.h> | 28 | #include <mach/msm_iomap.h> |
| 28 | #include <mach/irqs.h> | 29 | #include <mach/irqs.h> |
| 29 | #include <mach/board.h> | 30 | #include <mach/board.h> |