diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-18 21:06:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-18 21:06:10 -0700 |
| commit | 3eae03daa538303e0d28f56412c6c51f6452e493 (patch) | |
| tree | 767cd65426e5e041f741f46327a77df7a259cc8d /arch/arm/mach-pxa/colibri-pxa270.c | |
| parent | 47295aa4380dc990c38f86ec67fea425dcfd64c6 (diff) | |
| parent | a927ef895e288e79f1bfed221f27d7bfa37e907f (diff) | |
Merge tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux into fixesD
Merge "pxa fixes for v4.2" from Robert Jarzmik:
ARM: pxa: fixes for v4.2-rc2
This single fix reenables ethernet cards for several pxa boards,
broken by regulator addition to dm9000 driver.
* tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux:
ARM: pxa: fix dm9000 platform data regression
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa270.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa270.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c index 5f9d9303b346..3503826333c7 100644 --- a/arch/arm/mach-pxa/colibri-pxa270.c +++ b/arch/arm/mach-pxa/colibri-pxa270.c @@ -18,6 +18,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/platform_device.h> +#include <linux/regulator/machine.h> #include <linux/ucb1400.h> #include <asm/mach/arch.h> @@ -294,6 +295,8 @@ static void __init colibri_pxa270_init(void) printk(KERN_ERR "Illegal colibri_pxa270_baseboard type %d\n", colibri_pxa270_baseboard); } + + regulator_has_full_constraints(); } /* The "Income s.r.o. SH-Dmaster PXA270 SBC" board can be booted either |