diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-23 02:45:58 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-23 02:45:58 -0500 |
| commit | 973b659cbf2604b0b52829c224f6064d64118818 (patch) | |
| tree | b2929369b8d33b2083cba5bde8e32ea5deef1dae /drivers/video/omap2/dss/dispc.c | |
| parent | f15511e23db4e1deb6bf6a3c88c04ba85434e142 (diff) | |
| parent | ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed (diff) | |
Merge branch 'work/old-omapfb-removal'
Diffstat (limited to 'drivers/video/omap2/dss/dispc.c')
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 22023bba63e6..700bb563cfcd 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/pm_runtime.h> | 38 | #include <linux/pm_runtime.h> |
| 39 | 39 | ||
| 40 | #include <plat/sram.h> | ||
| 41 | #include <plat/clock.h> | 40 | #include <plat/clock.h> |
| 42 | 41 | ||
| 43 | #include <video/omapdss.h> | 42 | #include <video/omapdss.h> |