diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-10 22:01:14 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-10 22:01:14 -0500 |
| commit | e9ab3207310e8acfa3a5cd8cbb44860f69270bfd (patch) | |
| tree | dce036fd737b4edb7e107e21e4af12fabec29bbd /arch/arm/mach-omap2/board-zoom.c | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | 18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c (diff) | |
Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index e041c537ea37..e26754c24ee8 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
| @@ -130,6 +130,7 @@ static void __init omap_zoom_init(void) | |||
| 130 | ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS); | 130 | ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS); |
| 131 | zoom_debugboard_init(); | 131 | zoom_debugboard_init(); |
| 132 | zoom_peripherals_init(); | 132 | zoom_peripherals_init(); |
| 133 | zoom_display_init(); | ||
| 133 | } | 134 | } |
| 134 | 135 | ||
| 135 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | 136 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") |