Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
mach-pxa
/
icontrol.c
diff --git
a/kernel/arch/arm/mach-pxa/icontrol.c
b/kernel/arch/arm/mach-pxa/icontrol.c
index
c98511c
..
9b0eb02
100644
(file)
--- a/
kernel/arch/arm/mach-pxa/icontrol.c
+++ b/
kernel/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/spi/spi.h>
#include <linux/spi/pxa2xx_spi.h>
#include <linux/can/platform/mcp251x.h>
+#include <linux/regulator/machine.h>
#include "generic.h"
#include "generic.h"
@@
-185,6
+186,8
@@
static void __init icontrol_init(void)
mxm_8x10_mmc_init();
icontrol_can_init();
mxm_8x10_mmc_init();
icontrol_can_init();
+
+ regulator_has_full_constraints();
}
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
}
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")