| Message ID | 1393320673-13146-1-git-send-email-ike.pan@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 4290b3d..c3681ee 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -224,6 +224,7 @@ CONFIG_PMIC_DA903X=y CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y # CONFIG_PM_WAKELOCKS is not set +# CONFIG_POWER_RESET_SYSCON is not set CONFIG_PPS=m CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index dff768f..583d39f 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -142,6 +142,7 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m CONFIG_PHY_EXYNOS_MIPI_VIDEO=m CONFIG_PMIC_ADP5520=y CONFIG_PMIC_DA903X=y +CONFIG_POWER_RESET_SYSCON=y CONFIG_PPS=m CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index e08bbd3..5ba4aba 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -198,6 +198,7 @@ CONFIG_PMIC_DA903X=y CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y CONFIG_PM_WAKELOCKS=y +# CONFIG_POWER_RESET_SYSCON is not set CONFIG_PPS=y CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 07889c9..255630c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4835,7 +4835,6 @@ CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_VEXPRESS=y -# CONFIG_POWER_RESET_XGENE is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PPA8548=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 2290831..95df0bb 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -221,6 +221,7 @@ CONFIG_PMIC_DA903X=y CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y CONFIG_PM_WAKELOCKS=y +# CONFIG_POWER_RESET_SYSCON is not set CONFIG_PPS=m CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index f5749d4..2b925b3 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -231,6 +231,7 @@ CONFIG_PMIC_DA903X=y CONFIG_PM_RUNTIME=y CONFIG_PM_WAKELOCKS=y # CONFIG_POWER7_CPU is not set +# CONFIG_POWER_RESET_SYSCON is not set # CONFIG_PPC_DENORMALISATION is not set CONFIG_PPC_DISABLE_WERROR=y CONFIG_PPC_EPAPR_HV_BYTECHAN=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index ce7ba3f..47ad588 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -243,6 +243,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_PM_RUNTIME is not set # CONFIG_PM_WAKELOCKS is not set CONFIG_POWER7_CPU=y +# CONFIG_POWER_RESET_SYSCON is not set CONFIG_PPC64=y # CONFIG_PPC_970_NAP is not set # CONFIG_PPC_BOOK3E_64 is not set
BugLink: http://launchpad.net/bugs/1284433 Signed-off-by: Ike Panhc <ike.pan@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 + 7 files changed, 6 insertions(+), 1 deletion(-)