Merge branch 'sh-mobile-lcdc' of git://linuxtv.org/pinchartl/fbdev in…

…to fbdev-next
git-mirror · Aug 30, 2011 · 8edbeb6 · 8edbeb6
2 parents d4a7dbf + 8a20974
commit 8edbeb6
Show file tree

Hide file tree

Showing 6 changed files with 556 additions and 427 deletions.
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1583,6 +1583,7 @@ static void __init mackerel_init(void)
 
 	sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
 	sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device);
+	sh7372_add_device_to_domain(&sh7372_a4lc, &meram_device);
 	sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device);
 
 	hdmi_init_pm_clock();