diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-30 20:02:02 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-30 20:02:02 +0000 |
| commit | 8edbeb6eea647c26da482bd268ff67da209cba81 (patch) | |
| tree | 251e607854abb6f8e7d82838ff3d7fd36586cc27 /arch | |
| parent | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 (diff) | |
| parent | 8a20974f0370fe1b924704399e7ba327d894ef72 (diff) | |
Merge branch 'sh-mobile-lcdc' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index d41c01f83f15..6e3c2dfdcb81 100644 --- 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(); |