diff options
author | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:43 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:43 +0300 |
commit | 88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch) | |
tree | a64bf49e575ece017359ba5ac89fbc52efd81f2a /arch/x86 | |
parent | c364098fe8745b08a491fb43de785806ca91ba5e (diff) | |
parent | e5680c4de3eb3ea5538d11733a91ccef19badd69 (diff) | |
download | linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.xz |
Merge branch 'regulator-5.1' into regulator-next
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c b/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c index 96f438d4b026..1421d5330b2c 100644 --- a/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c +++ b/arch/x86/platform/intel-mid/device_libs/platform_bcm43xx.c @@ -44,7 +44,6 @@ static struct fixed_voltage_config bcm43xx_vmmc = { */ .microvolts = 2000000, /* 1.8V */ .startup_delay = 250 * 1000, /* 250ms */ - .enable_high = 1, /* active high */ .enabled_at_boot = 0, /* disabled at boot */ .init_data = &bcm43xx_vmmc_data, }; |