From 64996fdba36b44abb5d5fc74ceb3280686c19a6e Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Tue, 7 Apr 2009 16:48:51 +0100 Subject: [PATCH] --- yaml --- r: 142650 b: refs/heads/master c: 1dcb884ca8048efb4ce2999d367c26369ab2227c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/Kconfig | 7 +++++++ trunk/drivers/serial/Makefile | 1 + trunk/include/linux/serial_core.h | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a200d6577926..6e55e6b351d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05b363020decda179b51350bb9199a0c2ce3ef42 +refs/heads/master: 1dcb884ca8048efb4ce2999d367c26369ab2227c diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig index 07c03b9eb126..d89972beb12c 100644 --- a/trunk/drivers/serial/Kconfig +++ b/trunk/drivers/serial/Kconfig @@ -533,6 +533,13 @@ config SERIAL_S3C6400 Serial port support for the Samsung S3C6400 and S3C6410 SoCs +config SERIAL_MAX3100 + tristate "MAX3100 support" + depends on SPI + select SERIAL_CORE + help + MAX3100 chip support + config SERIAL_DZ bool "DECstation DZ serial driver" depends on MACH_DECSTATION && 32BIT diff --git a/trunk/drivers/serial/Makefile b/trunk/drivers/serial/Makefile index 8844c0a03929..d438eb2a73de 100644 --- a/trunk/drivers/serial/Makefile +++ b/trunk/drivers/serial/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o +obj-$(CONFIG_SERIAL_MAX3100) += max3100.o obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o obj-$(CONFIG_SERIAL_MUX) += mux.o obj-$(CONFIG_SERIAL_68328) += 68328serial.o diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h index 83e4b3ff9cda..57a97e52e58d 100644 --- a/trunk/include/linux/serial_core.h +++ b/trunk/include/linux/serial_core.h @@ -164,6 +164,9 @@ /* NWPSERIAL */ #define PORT_NWPSERIAL 85 +/* MAX3100 */ +#define PORT_MAX3100 86 + #ifdef __KERNEL__ #include