X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Fcpm_uart%2Fcpm_uart.h;h=5f6187baad86454f61a50053b824f97b62177e28;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=598704e7eb67bd487ca5255f4a12abed00f536b5;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index 598704e7e..5f6187baa 100644
--- 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];