diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:46 +0000 |
| commit | 8415e604452966f981f20cb4d8a8a30e38a772dd (patch) | |
| tree | 0c111cf6c6ed487c9baee37275621097d57f5127 /drivers/acpi | |
| parent | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (diff) | |
| parent | 29b5f720990fafc302a034468455426dd662e101 (diff) | |
Merge tag 'v3.10.30' into linux-linaro-lskHEADlinux-linaro-lsk-v3.10linux-linaro-lsk
This is the 3.10.30 stable release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/bus.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 292de3cab9c..ccba6e46cfb 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -33,6 +33,7 @@ #include <linux/proc_fs.h> #include <linux/acpi.h> #include <linux/slab.h> +#include <linux/regulator/machine.h> #ifdef CONFIG_X86 #include <asm/mpspec.h> #endif @@ -705,6 +706,14 @@ void __init acpi_early_init(void) goto error0; } + /* + * If the system is using ACPI then we can be reasonably + * confident that any regulators are managed by the firmware + * so tell the regulator core it has everything it needs to + * know. + */ + regulator_has_full_constraints(); + return; error0: |