2 files changed, 3 insertions, 38 deletions

diff --git a/include/asm-mips/dec/serial.h b/include/asm-mips/dec/serial.h
deleted file mode 100644
index acad75890a05..000000000000
--- a/include/asm-mips/dec/serial.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *      include/asm-mips/dec/serial.h
- *
- *      Definitions common to all DECstation serial devices.
- *
- *      Copyright (C) 2004  Maciej W. Rozycki
- *
- *      Based on bits extracted from drivers/tc/zs.h for which
- *      the following copyrights apply:
- *
- *      Copyright (C) 1995  David S. Miller (davem@caip.rutgers.edu)
- *      Copyright (C) 1996  Paul Mackerras (Paul.Mackerras@cs.anu.edu.au)
- *      Copyright (C)       Harald Koerfgen
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- */
-#ifndef __ASM_MIPS_DEC_SERIAL_H
-#define __ASM_MIPS_DEC_SERIAL_H
-
-struct dec_serial_hook {
-        int (*init_channel)(void *handle);
-        void (*init_info)(void *handle);
-        void (*rx_char)(unsigned char ch, unsigned char fl);
-        int (*poll_rx_char)(void *handle);
-        int (*poll_tx_char)(void *handle, unsigned char ch);
-        unsigned int cflags;
-};
-
-extern int register_dec_serial_hook(unsigned int channel,
-                                    struct dec_serial_hook *hook);
-extern int unregister_dec_serial_hook(unsigned int channel);
-
-#endif /* __ASM_MIPS_DEC_SERIAL_H */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 9c721cd2c9d6..773d8d8828ad 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -62,8 +62,9 @@
 /* NEC v850.  */
 #define PORT_V850E_UART 40
 
-/* DZ */
-#define PORT_DZ         47
+/* DEC */
+#define PORT_DZ         46
+#define PORT_ZS         47
 
 /* Parisc type numbers. */
 #define PORT_MUX        48