diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 13:19:03 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 13:19:03 -0800 |
commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/mach-shmobile/board-armadillo800eva.c | |
parent | f015941f6b4a7d4d90c46a65bca17f2c2c41fb89 (diff) | |
parent | f7c66dc0bf0f4ecd349c79315c87841c67e27aef (diff) | |
download | kernel_replicant_linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.gz kernel_replicant_linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.bz2 kernel_replicant_linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.zip |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index e7912447ad50..65731370da81 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1181,6 +1181,8 @@ static void __init eva_init(void) rmobile_add_device_to_domain("A4LC", &hdmi_lcdc_device); if (usb) rmobile_add_device_to_domain("A3SP", usb); + + r8a7740_pm_init(); } static void __init eva_earlytimer_init(void) |