diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:21:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:21:02 -0400 |
| commit | 5f76945a9c978b8b8bf8eb7fe3b17b9981240a97 (patch) | |
| tree | df61aca168df657bc71ce8b578bcb0c81b0622ee /arch/arm/mach-s3c64xx/mach-hmt.c | |
| parent | 940e3a8dd6683a3787faf769b3df7a06f1c2fa31 (diff) | |
| parent | cd9d6f10d07f26dd8a70e519c22b6b4f8a9e3e7a (diff) | |
Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6
Pull fbdev updates from Florian Tobias Schandinat:
"This includes:
- large updates for OMAP
- basic OMAP5 DSS support for DPI and DSI outputs
- large cleanups and restructuring
- some update to Exynos and da8xx-fb
- removal of the pnx4008 driver (arch removed)
- various other small patches"
Fix up some trivial conflicts (mostly just include line changes, but
also some due to the renaming of the deferred work functions by Tejun).
* tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6: (193 commits)
gbefb: fix compile error
video: mark nuc900fb_map_video_memory as __devinit
video/mx3fb: set .owner to prevent module unloading while being used
video: exynos_dp: use clk_prepare_enable and clk_disable_unprepare
drivers/video/exynos/exynos_mipi_dsi.c: fix error return code
drivers/video/savage/savagefb_driver.c: fix error return code
video: s3c-fb: use clk_prepare_enable and clk_disable_unprepare
da8xx-fb: save and restore LCDC context across suspend/resume cycle
da8xx-fb: add pm_runtime support
video/udlfb: fix line counting in fb_write
OMAPDSS: add missing include for string.h
OMAPDSS: DISPC: Configure color conversion coefficients for writeback
OMAPDSS: DISPC: Add manager like functions for writeback
OMAPDSS: DISPC: Configure writeback FIFOs
OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
OMAPDSS: DISPC: Add function to set channel in for writeback
OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
OMAPDSS: DISPC: Downscale chroma if plane is writeback
OMAPDSS: DISPC: Configure input and output sizes for writeback
...
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-hmt.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 02222b32b7d3..2b144893ddc4 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | #include <asm/mach/irq.h> | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | ||
| 29 | #include <video/samsung_fimd.h> | ||
| 29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 30 | #include <mach/map.h> | 31 | #include <mach/map.h> |
| 31 | 32 | ||
| @@ -41,7 +42,6 @@ | |||
| 41 | #include <plat/clock.h> | 42 | #include <plat/clock.h> |
| 42 | #include <plat/devs.h> | 43 | #include <plat/devs.h> |
| 43 | #include <plat/cpu.h> | 44 | #include <plat/cpu.h> |
| 44 | #include <plat/regs-fb-v4.h> | ||
| 45 | 45 | ||
| 46 | #include "common.h" | 46 | #include "common.h" |
| 47 | 47 | ||