| Message ID | 1359673776-2131-2-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index aea426a..ed58104 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -97,7 +97,6 @@ CONFIG_RTC_DRV_TWL4030=m CONFIG_SATA_AHCI_PLATFORM=y # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set -CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIO_SERPORT=y # CONFIG_SGI_PARTITION is not set CONFIG_SND=m diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 253caf4..2277fd4 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -97,7 +97,6 @@ CONFIG_RTC_DRV_TWL4030=y CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SCHED_AUTOGROUP=y CONFIG_SENSORS_SCH56XX_COMMON=m -CONFIG_SERIAL_AMBA_PL011=m CONFIG_SERIO_SERPORT=m CONFIG_SGI_PARTITION=y CONFIG_SND=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a309c95..2d74f315 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5053,6 +5053,7 @@ CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_AMBA_PL010=m +CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/armhf/config.flavour.highbank | 1 - debian.master/config/armhf/config.flavour.omap | 1 - debian.master/config/config.common.ubuntu | 1 + 3 files changed, 1 insertion(+), 2 deletions(-)