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 /arch/arm/mach-s3c24xx | |
| 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 '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 @@ | |||
| 29 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
| 30 | #include <asm/mach/irq.h> | 30 | #include <asm/mach/irq.h> |
| 31 | 31 | ||
| 32 | #include <video/samsung_fimd.h> | ||
| 32 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
| 33 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
| 34 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
| @@ -52,7 +53,6 @@ | |||
| 52 | #include <plat/udc.h> | 53 | #include <plat/udc.h> |
| 53 | #include <linux/platform_data/s3c-hsudc.h> | 54 | #include <linux/platform_data/s3c-hsudc.h> |
| 54 | 55 | ||
| 55 | #include <plat/regs-fb-v4.h> | ||
| 56 | #include <plat/fb.h> | 56 | #include <plat/fb.h> |
| 57 | 57 | ||
| 58 | #include <plat/common-smdk.h> | 58 | #include <plat/common-smdk.h> |