[PATCH Xenial SRU] UBUNTU: [Config] CONFIG_LIVEPATCH=y for s390x

[Tim Gardner]

BugLink: http://bugs.launchpad.net/bugs/1633577

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 -
 debian.master/config/config.common.ubuntu      | 1 +
 debian.master/config/s390x/config.common.s390x | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c47096d..1719953 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -164,7 +164,6 @@ CONFIG_KVM=m
 CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
-CONFIG_LIVEPATCH=y
 CONFIG_LLC2=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ce9b6c9..266696f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4209,6 +4209,7 @@ CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_ZILOG=m
 CONFIG_LIS3L02DQ=m
 CONFIG_LITELINK_DONGLE=m
+CONFIG_LIVEPATCH=y
 # CONFIG_LKDTM is not set
 CONFIG_LLC=m
 CONFIG_LOCALVERSION=""
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 15423a5..9207ec6 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -137,7 +137,6 @@ CONFIG_KVM=y
 # CONFIG_LAPB is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LIBNVDIMM is not set
-# CONFIG_LIVEPATCH is not set
 # CONFIG_LLC2 is not set
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_LPC_ICH is not set
-- 
2.7.4