summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/vpac270.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-07-19 06:06:10 +0200
committerOlof Johansson <olof@lixom.net>2015-07-19 06:06:10 +0200
commit3eae03daa538303e0d28f56412c6c51f6452e493 (patch)
tree767cd65426e5e041f741f46327a77df7a259cc8d /arch/arm/mach-pxa/vpac270.c
parentMerge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentARM: pxa: fix dm9000 platform data regression (diff)
downloadlinux-3eae03daa538303e0d28f56412c6c51f6452e493.tar.xz
linux-3eae03daa538303e0d28f56412c6c51f6452e493.zip
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/vpac270.c')
-rw-r--r--arch/arm/mach-pxa/vpac270.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index aa89488f961e..54122a983ae3 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -24,6 +24,7 @@
#include <linux/dm9000.h>
#include <linux/ucb1400.h>
#include <linux/ata_platform.h>
+#include <linux/regulator/machine.h>
#include <linux/regulator/max1586.h>
#include <linux/i2c/pxa-i2c.h>
@@ -711,6 +712,8 @@ static void __init vpac270_init(void)
vpac270_ts_init();
vpac270_rtc_init();
vpac270_ide_init();
+
+ regulator_has_full_constraints();
}
MACHINE_START(VPAC270, "Voipac PXA270")