diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-09-20 15:57:47 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-09-20 15:57:47 +0200 |
| commit | 8e83cd7ca4d2e60b72c92bc9f18ef303a7ce6b6d (patch) | |
| tree | 92edfdfdceb940bafd4d01dd270288a5f2a139a1 /drivers/gpu | |
| parent | video: exynos_dp: move setting analog parameter and interrupt to after sw reset (diff) | |
| parent | include/video: Add register offsets for FIMD version 8 (diff) | |
| download | linux-8e83cd7ca4d2e60b72c92bc9f18ef303a7ce6b6d.tar.xz linux-8e83cd7ca4d2e60b72c92bc9f18ef303a7ce6b6d.zip | |
Merge branch 'v3.7-for-florian' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fbdev-next
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index a68d2b313f03..24c0bd4a2661 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -19,8 +19,8 @@ #include <linux/clk.h> #include <linux/pm_runtime.h> +#include <video/samsung_fimd.h> #include <drm/exynos_drm.h> -#include <plat/regs-fb-v4.h> #include "exynos_drm_drv.h" #include "exynos_drm_fbdev.h" |