[PATCH 1/1] UBUNTU: [Config] enable various HVC consoles

[Andy Whitcroft]

Larger powerpc boxes use the HVC console support.  Enable these for the
powerpc64-smp kernel.

BugLink: http://bugs.launchpad.net/bugs/1102206
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/config/config.common.ubuntu          | 3 ++-
 debian.master/config/powerpc/config.common.powerpc | 1 -
 debian.master/config/ppc64/config.common.ppc64     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f240c29..d145e8e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2079,7 +2079,8 @@ CONFIG_HTC_PASIC3=m
 CONFIG_HT_IRQ=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
-CONFIG_HVCS=m
+CONFIG_HVCS=y
+CONFIG_HVC_CONSOLE=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_OLD_HVSI=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index be8b572..9651912 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -93,7 +93,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
 CONFIG_HTC_I2CPLD=y
-# CONFIG_HVC_CONSOLE is not set
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_DESIGNWARE_CORE=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 8ef1cb9..02d3b25 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -104,7 +104,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_HVC_CONSOLE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_DESIGNWARE_CORE=m
-- 
1.8.0