MRW: Use a distro override to enable providers

Now that obmc-mrw is no longer a machine feature we can organize
a bit and enable MRW providers off to the side with a disto override,
de-cluttering wherever non-MRW defaults are specified.

No functional impact but slightly easier for humans to parse.

Change-Id: If2731206b94e16e0b0132a385756eb11178118f2
Tested: Built a Witherspoon image and validated manifest
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
index 0085a14..5d2f25f 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -24,12 +24,12 @@
         "
 
 # Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
 
 # Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
     "phosphor-fan-presence-config-native"
 
 # Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
     "phosphor-fan-control-fan-config-native"