[PATCH natty] UBUNTU: [Config] Build-in powermac ZILOG serial driver

[Jeremy Kerr]

SERIAL_PMAC_ZILOG allows us to get a serial device on KVM-virtualised
powerpc, so build it in to the kernel to allow serial console on these
platforms. This also requires SERIAL_PMAC_ZILOG_CONSOLE.

Since we now set SERIAL_CORE=y on powerpc, this change moves it into the
common.ubuntu config.

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

Signed-off-by: Jeremy Kerr <jeremy.kerr at canonical.com>

---
 debian.master/config/amd64/config.common.amd64     |    2 +-
 debian.master/config/armel/config.common.armel     |    2 +-
 debian.master/config/config.common.ubuntu          |    3 ++-
 debian.master/config/i386/config.common.i386       |    2 +-
 debian.master/config/powerpc/config.common.powerpc |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 202ddd7..03cac17 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -348,7 +348,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_PMACZILOG is not set
 CONFIG_SERIAL_UARTLITE=m
 # CONFIG_SLAB is not set
 CONFIG_SLHC=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index b2bcc3f..d1b714a 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -213,7 +213,7 @@ CONFIG_SENSORS_ADS7828=m
 # CONFIG_SENSORS_AK8975 is not set
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_PMACZILOG is not set
 # CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SLHC=y
 CONFIG_SMSC_PHY=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7d900d9..634828a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4077,6 +4077,7 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_SERIAL_ICOM is not set
@@ -4089,7 +4090,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_SERIAL_PMACZILOG=m
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
 # CONFIG_SERIAL_PMACZILOG_TTYS is not set
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIO=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f0c8dd4..6eb1cdd 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -350,7 +350,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_CORE=y
+# CONFIG_SERIAL_PMACZILOG is not set
 CONFIG_SERIAL_UARTLITE=m
 # CONFIG_SLAB is not set
 CONFIG_SLHC=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 94934cc..2d18a88 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -315,7 +315,7 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_CORE=m
+CONFIG_SERIAL_PMACZILOG=y
 CONFIG_SERIAL_UARTLITE=m
 # CONFIG_SLAB is not set
 CONFIG_SLHC=m