From 2be06b45cb0eb4fdddb7fe6afb74b14815885416 Mon Sep 17 00:00:00 2001 From: Damian Date: Wed, 22 Jun 2011 07:49:52 +0000 Subject: [PATCH] --- yaml --- r: 271282 b: refs/heads/master c: 91142bfe98d2a4e52969e12aa0e48e48505bcee2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d0e00596b271..c299210c99eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b3bb77c3a07a94d878fd3219302c46209f7d71c +refs/heads/master: 91142bfe98d2a4e52969e12aa0e48e48505bcee2 diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c index d41c01f83f15..6e3c2dfdcb81 100644 --- a/trunk/arch/arm/mach-shmobile/board-mackerel.c +++ b/trunk/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();