vserver 1.9.5.x5

[linux-2.6.git] / drivers / serial / cpm_uart / cpm_uart.h

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index 598704e..5f6187b 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -17,13 +17,8 @@
 #include "cpm_uart_cpm1.h"
 #endif
 
-#ifndef CONFIG_SERIAL_8250
-#define SERIAL_CPM_MAJOR       TTY_MAJOR
-#define SERIAL_CPM_MINOR       64
-#else
 #define SERIAL_CPM_MAJOR       204
-#define SERIAL_CPM_MINOR       42
-#endif
+#define SERIAL_CPM_MINOR       46
 
 #define IS_SMC(pinfo)          (pinfo->flags & FLAG_SMC)
 #define IS_DISCARDING(pinfo)   (pinfo->flags & FLAG_DISCARDING)
@@ -70,6 +65,8 @@ struct uart_cpm_port {
        /* helpers */
        int                      baud;
        int                      bits;
+       /* Keep track of 'odd' SMC2 wirings */
+       int                     is_portb;
 };
 
 extern int cpm_uart_port_map[UART_NR];