summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/Makefile4
-rw-r--r--drivers/serial/serial_core.c (renamed from drivers/serial/core.c)0
-rw-r--r--drivers/serial/serial_cs.c (renamed from drivers/serial/8250_cs.c)0
-rw-r--r--include/linux/serial_core.h6
4 files changed, 8 insertions, 2 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 611eb6c84e02..fdc96e347228 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -11,10 +11,10 @@ serial-8250-$(CONFIG_PNP) += 8250_pnp.o
serial-8250-$(CONFIG_SERIAL_8250_HCDP) += 8250_hcdp.o
serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o
-obj-$(CONFIG_SERIAL_CORE) += core.o
+obj-$(CONFIG_SERIAL_CORE) += serial_core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o
obj-$(CONFIG_SERIAL_8250) += 8250.o $(serial-8250-y)
-obj-$(CONFIG_SERIAL_8250_CS) += 8250_cs.o
+obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
obj-$(CONFIG_SERIAL_ANAKIN) += anakin.o
obj-$(CONFIG_SERIAL_AMBA) += amba.o
diff --git a/drivers/serial/core.c b/drivers/serial/serial_core.c
index a264d72ca695..a264d72ca695 100644
--- a/drivers/serial/core.c
+++ b/drivers/serial/serial_core.c
diff --git a/drivers/serial/8250_cs.c b/drivers/serial/serial_cs.c
index a70c3ddfadfa..a70c3ddfadfa 100644
--- a/drivers/serial/8250_cs.c
+++ b/drivers/serial/serial_cs.c
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 5bb8b174ca68..0bc15aeb153e 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -67,6 +67,12 @@
#define PORT_PC9861 45
#define PORT_PC9801_101 46
+/* DZ */
+#define PORT_DZ 47
+
+/* Parisc type numbers. */
+#define PORT_MUX 48
+
/* Macintosh Zilog type numbers */
#define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */
#define PORT_PMAC_ZILOG 51