diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 21:55:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-10 21:55:17 -0800 |
| commit | aa2cf420593b67cc93de7a3f675b2a88eba0505f (patch) | |
| tree | dfb3c73a8a3987c3b3ba08083f379ebc90942e03 /drivers/video/omap/sossi.c | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
| parent | 178ff4c9175db447f93b7343954b1d44707c881b (diff) | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
MAINTAINERS: Add OMAP2/3 DSS and OMAPFB maintainer
OMAP: SDP: Enable DSS2 for OMAP3 SDP board
OMAP: DSS2: Taal DSI command mode panel driver
OMAP: DSS2: Add generic and Sharp panel drivers
OMAP: DSS2: omapfb driver
OMAP: DSS2: DSI driver
OMAP: DSS2: SDI driver
OMAP: DSS2: RFBI driver
OMAP: DSS2: Video encoder driver
OMAP: DSS2: DPI driver
OMAP: DSS2: DISPC
OMAP: DSS2: Add more core files
OMAP: DSS2: Display Subsystem Driver core
OMAP: DSS2: Documentation for DSS2
OMAP: Add support for VRFB rotation engine
OMAP: Add VRAM manager
OMAP: OMAPFB: add omapdss device
OMAP: OMAPFB: split omapfb.h
OMAP2: Add funcs for writing SMS_ROT_* registers
Diffstat (limited to 'drivers/video/omap/sossi.c')
| -rw-r--r-- | drivers/video/omap/sossi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index 79dc84f0971..8fb7c708f56 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c @@ -23,10 +23,11 @@ #include <linux/clk.h> #include <linux/irq.h> #include <linux/io.h> +#include <linux/interrupt.h> #include <plat/dma.h> -#include <plat/omapfb.h> +#include "omapfb.h" #include "lcdc.h" #define MODULE_NAME "omapfb-sossi" |