diff options
author | Mark Brown | 2019-03-04 16:32:43 +0100 |
---|---|---|
committer | Mark Brown | 2019-03-04 16:32:43 +0100 |
commit | 88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch) | |
tree | a64bf49e575ece017359ba5ac89fbc52efd81f2a /arch/arm/mach-omap1/board-ams-delta.c | |
parent | Merge branch 'regulator-5.0' into regulator-linus (diff) | |
parent | regulator: mc13xxx: Constify regulator_ops variables (diff) | |
download | kernel-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/arm/mach-omap1/board-ams-delta.c')
-rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index c4c0a8ea11e4..be30c3c061b4 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -267,7 +267,6 @@ static struct fixed_voltage_config modem_nreset_config = { .supply_name = "modem_nreset", .microvolts = 3300000, .startup_delay = 25000, - .enable_high = 1, .enabled_at_boot = 1, .init_data = &modem_nreset_data, }; @@ -533,7 +532,6 @@ static struct regulator_init_data keybrd_pwr_initdata = { static struct fixed_voltage_config keybrd_pwr_config = { .supply_name = "keybrd_pwr", .microvolts = 5000000, - .enable_high = 1, .init_data = &keybrd_pwr_initdata, }; |