UBUNTU: [Config] CONFIG_REGULATOR_TPS65217=n for powerpc

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 52aea59908e29f17096d8b198e5d0fde1778f7a9..a7b1cb98b23712bf69d694e0bf62daa0c68547c2 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6934,7 +6934,7 @@ CONFIG_REGULATOR_TPS62360                       policy<{'amd64': 'm', 'arm64': '
 CONFIG_REGULATOR_TPS65023                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6507X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS65090                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_REGULATOR_TPS65217                       policy<{'amd64': 'm', 'arm64': '-', 'armhf': 'y', 'i386': 'm', 'powerpc': 'm', 'ppc64el': '-'}>
+CONFIG_REGULATOR_TPS65217                       policy<{'amd64': 'm', 'arm64': '-', 'armhf': 'y', 'i386': 'm', 'powerpc': '-', 'ppc64el': '-'}>
 CONFIG_REGULATOR_TPS65218                       policy<{'arm64': 'm', 'armhf': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6524X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6586X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index c38a880c426ce6fb173da9b1c47d3080ad54e9d8..028f91f7a674b7e19d093b9d564a5b353dac9f88 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -305,7 +305,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
-CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65217 is not set
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_VX855=m
@@ -460,7 +460,6 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 # CONFIG_RESET_BERLIN is not set
 CONFIG_RESET_CONTROLLER=y