diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
commit | 794d26fa53ad7e8cb54a3a5773436b1d8e813f35 (patch) | |
tree | 92940f7842138b00efea3b42140093a3bf39b81b /meta-phosphor/conf/distro/include/phosphor-defaults.inc | |
parent | 235618c7396902842906bc3a8c90a3320aeeaeba (diff) | |
parent | a6da583e088a2e9462d5330555a704402eff74a9 (diff) | |
download | openbmc-794d26fa53ad7e8cb54a3a5773436b1d8e813f35.tar.xz |
Merge tag 'wht-0.53' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/conf/distro/include/phosphor-defaults.inc')
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 55b6e0fec..58be25a05 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -110,11 +110,6 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" # automatically if the MRW feature is enabled. VIRTUAL-RUNTIME_phosphor-hwmon-config ?= "" -# obmc-settings-mgmt -# -# Provides a manager for user settings. -VIRTUAL-RUNTIME_obmc-settings-mgmt ?= "phosphor-settings-manager" - # obmc-network-manager # # Provide support for managing network |