Merge branch 'v3.7-for-florian' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fbdev-next

This commit is contained in:
Florian Tobias Schandinat
2012-09-20 13:57:47 +00:00
26 changed files with 165 additions and 194 deletions

View File

@@ -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