diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-09-20 09:57:47 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-09-20 09:57:47 -0400 |
| commit | 8e83cd7ca4d2e60b72c92bc9f18ef303a7ce6b6d (patch) | |
| tree | 92edfdfdceb940bafd4d01dd270288a5f2a139a1 /drivers/gpu | |
| parent | 75435c742bc97373399002d75d71bb1c8f8637bf (diff) | |
| parent | a44cf75dcb28c0e8ea82db26e43112b4f63d1f8b (diff) | |
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 @@ | |||
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/pm_runtime.h> | 20 | #include <linux/pm_runtime.h> |
| 21 | 21 | ||
| 22 | #include <video/samsung_fimd.h> | ||
| 22 | #include <drm/exynos_drm.h> | 23 | #include <drm/exynos_drm.h> |
| 23 | #include <plat/regs-fb-v4.h> | ||
| 24 | 24 | ||
| 25 | #include "exynos_drm_drv.h" | 25 | #include "exynos_drm_drv.h" |
| 26 | #include "exynos_drm_fbdev.h" | 26 | #include "exynos_drm_fbdev.h" |