summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorMark Brown2019-03-04 16:32:43 +0100
committerMark Brown2019-03-04 16:32:43 +0100
commit88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch)
treea64bf49e575ece017359ba5ac89fbc52efd81f2a /arch/sh
parentMerge branch 'regulator-5.0' into regulator-linus (diff)
parentregulator: mc13xxx: Constify regulator_ops variables (diff)
downloadkernel-qcow2-linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.gz
kernel-qcow2-linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.xz
kernel-qcow2-linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.zip
Merge branch 'regulator-5.1' into regulator-next
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 22b4106b8084..5495efa07335 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -630,7 +630,6 @@ static struct regulator_init_data cn12_power_init_data = {
static struct fixed_voltage_config cn12_power_info = {
.supply_name = "CN12 SD/MMC Vdd",
.microvolts = 3300000,
- .enable_high = 1,
.init_data = &cn12_power_init_data,
};
@@ -671,7 +670,6 @@ static struct regulator_init_data sdhi0_power_init_data = {
static struct fixed_voltage_config sdhi0_power_info = {
.supply_name = "CN11 SD/MMC Vdd",
.microvolts = 3300000,
- .enable_high = 1,
.init_data = &sdhi0_power_init_data,
};