git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'disintegrate-m68k-20121009' of git://git.infradead.org/users/dhowells...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-exynos
/
mach-smdkv310.c
diff --git
a/arch/arm/mach-exynos/mach-smdkv310.c
b/arch/arm/mach-exynos/mach-smdkv310.c
index c15d2238ceb017e40b44206951c26e4aaa7ff39c..ee4fb1a9cb7207b226fdffc24f4e4016fafc7618 100644
(file)
--- a/
arch/arm/mach-exynos/mach-smdkv310.c
+++ b/
arch/arm/mach-exynos/mach-smdkv310.c
@@
-27,9
+27,9
@@
#include <asm/mach-types.h>
#include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
#include <plat/regs-serial.h>
#include <plat/regs-srom.h>
-#include <plat/regs-fb-v4.h>
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/fb.h>