aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/trizeps4.c
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2015-09-09 17:00:58 -0500
committerGary S. Robertson <gary.robertson@linaro.org>2015-09-09 17:00:58 -0500
commitb00df57e50e087151f4ca976ca2796ea105f68c1 (patch)
tree041e22fd6831e8231d7405a445607979d1387775 /arch/arm/mach-pxa/trizeps4.c
parent6f7cc80865bae836c963fe4d405fe27496024f6f (diff)
parentb7be2a1de3f5c0827a4f8ccb6a18342d9d4dc446 (diff)
Merge tag 'lsk-v4.1-15.08' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1linux-lng-4.1.5-2015.09
LSK 15.08 v4.1
Diffstat (limited to 'arch/arm/mach-pxa/trizeps4.c')
-rw-r--r--arch/arm/mach-pxa/trizeps4.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 872dcb20e757..066e3a250ee0 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -26,6 +26,7 @@
#include <linux/dm9000.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/partitions.h>
+#include <linux/regulator/machine.h>
#include <linux/i2c/pxa-i2c.h>
#include <asm/types.h>
@@ -534,6 +535,8 @@ static void __init trizeps4_init(void)
BCR_writew(trizeps_conxs_bcr);
board_backlight_power(1);
+
+ regulator_has_full_constraints();
}
static void __init trizeps4_map_io(void)