projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
devices
/
platform-imx-fb.c
diff --git
a/arch/arm/mach-imx/devices/platform-imx-fb.c
b/arch/arm/mach-imx/devices/platform-imx-fb.c
index
7df6328
..
aa00272
100644
(file)
--- a/
arch/arm/mach-imx/devices/platform-imx-fb.c
+++ b/
arch/arm/mach-imx/devices/platform-imx-fb.c
@@
-19,11
+19,6
@@
.irq = soc ## _INT_LCDC, \
}
.irq = soc ## _INT_LCDC, \
}
-#ifdef CONFIG_SOC_IMX1
-const struct imx_imx_fb_data imx1_imx_fb_data __initconst =
- imx_imx_fb_data_entry_single(MX1, "imx1-fb", SZ_4K);
-#endif /* ifdef CONFIG_SOC_IMX1 */
-
#ifdef CONFIG_SOC_IMX21
const struct imx_imx_fb_data imx21_imx_fb_data __initconst =
imx_imx_fb_data_entry_single(MX21, "imx21-fb", SZ_4K);
#ifdef CONFIG_SOC_IMX21
const struct imx_imx_fb_data imx21_imx_fb_data __initconst =
imx_imx_fb_data_entry_single(MX21, "imx21-fb", SZ_4K);