diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-19 07:06:10 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-19 07:06:10 +0300 |
| commit | 3eae03daa538303e0d28f56412c6c51f6452e493 (patch) | |
| tree | 767cd65426e5e041f741f46327a77df7a259cc8d /arch/arm/mach-pxa/icontrol.c | |
| parent | 47295aa4380dc990c38f86ec67fea425dcfd64c6 (diff) | |
| parent | a927ef895e288e79f1bfed221f27d7bfa37e907f (diff) | |
| download | linux-3eae03daa538303e0d28f56412c6c51f6452e493.tar.xz | |
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/icontrol.c')
| -rw-r--r-- | arch/arm/mach-pxa/icontrol.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index c98511c5abd1..9b0eb0252af6 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c @@ -26,6 +26,7 @@ #include <linux/spi/spi.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/can/platform/mcp251x.h> +#include <linux/regulator/machine.h> #include "generic.h" @@ -185,6 +186,8 @@ static void __init icontrol_init(void) mxm_8x10_mmc_init(); icontrol_can_init(); + + regulator_has_full_constraints(); } MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") |