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 /arch/arm/mach-s3c24xx | |
| 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 'arch/arm/mach-s3c24xx')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c index c3100a044fbe..96478f05fc00 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2416.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c @@ -29,6 +29,7 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> +#include <video/samsung_fimd.h> #include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach-types.h> @@ -52,7 +53,6 @@ #include <plat/udc.h> #include <linux/platform_data/s3c-hsudc.h> -#include <plat/regs-fb-v4.h> #include <plat/fb.h> #include <plat/common-smdk.h> |