diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/omap/sossi.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/omap/sossi.c')
| -rw-r--r-- | drivers/video/omap/sossi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index a76946220249..8fb7c708f563 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
| @@ -23,10 +23,11 @@ | |||
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | #include <linux/interrupt.h> | ||
| 26 | 27 | ||
| 27 | #include <mach/dma.h> | 28 | #include <plat/dma.h> |
| 28 | #include <mach/omapfb.h> | ||
| 29 | 29 | ||
| 30 | #include "omapfb.h" | ||
| 30 | #include "lcdc.h" | 31 | #include "lcdc.h" |
| 31 | 32 | ||
| 32 | #define MODULE_NAME "omapfb-sossi" | 33 | #define MODULE_NAME "omapfb-sossi" |