From 667bdd72fb5e247d3840bc264f3089350572040c Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Fri, 28 Jan 2011 18:00:02 +0900 Subject: [PATCH] --- yaml --- r: 235514 b: refs/heads/master c: 380042f2db653b324ae756d102d872c1ecd412c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/Kconfig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e8eaf0a677ec..19504ca4856e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4564e1ef219fa69ed827fe2613569543a6b26fbc +refs/heads/master: 380042f2db653b324ae756d102d872c1ecd412c5 diff --git a/trunk/drivers/tty/serial/Kconfig b/trunk/drivers/tty/serial/Kconfig index 86e2c994d440..aaedbad93a75 100644 --- a/trunk/drivers/tty/serial/Kconfig +++ b/trunk/drivers/tty/serial/Kconfig @@ -1588,10 +1588,9 @@ config SERIAL_IFX6X60 Support for the IFX6x60 modem devices on Intel MID platforms. config SERIAL_PCH_UART - tristate "Intel EG20T PCH UART" - depends on PCI && DMADEVICES + tristate "Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH" + depends on PCI select SERIAL_CORE - select PCH_DMA help This driver is for PCH(Platform controller Hub) UART of Intel EG20T which is an IOH(Input/Output Hub) for x86 embedded processor.