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-s3c64xx/mach-hmt.c | |
| 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-s3c64xx/mach-hmt.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 689088162f77..8ad0bfcc93f3 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | #include <asm/mach/irq.h> | 27 | #include <asm/mach/irq.h> |
| 28 | 28 | ||
| 29 | #include <video/samsung_fimd.h> | ||
| 29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 30 | #include <mach/map.h> | 31 | #include <mach/map.h> |
| 31 | 32 | ||
| @@ -41,7 +42,6 @@ | |||
| 41 | #include <plat/clock.h> | 42 | #include <plat/clock.h> |
| 42 | #include <plat/devs.h> | 43 | #include <plat/devs.h> |
| 43 | #include <plat/cpu.h> | 44 | #include <plat/cpu.h> |
| 44 | #include <plat/regs-fb-v4.h> | ||
| 45 | 45 | ||
| 46 | #include "common.h" | 46 | #include "common.h" |
| 47 | 47 | ||