summaryrefslogtreecommitdiffstats
path: root/drivers/video/s3c-fb.c
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-09-20 13:57:47 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-09-20 13:57:47 +0000
commit8e83cd7ca4d2e60b72c92bc9f18ef303a7ce6b6d (patch)
tree92edfdfdceb940bafd4d01dd270288a5f2a139a1 /drivers/video/s3c-fb.c
parent75435c742bc97373399002d75d71bb1c8f8637bf (diff)
parenta44cf75dcb28c0e8ea82db26e43112b4f63d1f8b (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/video/s3c-fb.c')
-rw-r--r--drivers/video/s3c-fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 6c951264357..52b744f58f4 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -25,8 +25,8 @@
#include <linux/interrupt.h>
#include <linux/pm_runtime.h>
+#include <video/samsung_fimd.h>
#include <mach/map.h>
-#include <plat/regs-fb-v4.h>
#include <plat/fb.h>
/* This driver will export a number of framebuffer interfaces depending