Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / tty / serial / 68328serial.h

diff --git a/drivers/serial/68328serial.h b/drivers/tty/serial/68328serial.h
similarity index 98%
rename from drivers/serial/68328serial.h
rename to drivers/tty/serial/68328serial.h
index 58aa2154655b01385b14e63df1abf81a24d32b9d..664ceb0a158cf8213d8a9e03f064ffbff795595d 100644 (file)
--- a/drivers/serial/68328serial.h
+++ b/drivers/tty/serial/68328serial.h
@@ -181,13 +181,8 @@ struct m68k_serial {
 /* 
  * Define the number of ports supported and their irqs.
  */
-#ifndef CONFIG_68328_SERIAL_UART2
 #define NR_PORTS 1
 #define UART_IRQ_DEFNS {UART_IRQ_NUM}
-#else
-#define NR_PORTS 2
-#define UART_IRQ_DEFNS {UART1_IRQ_NUM, UART2_IRQ_NUM}
-#endif
 
 #endif /* __KERNEL__ */
 #endif /* !(_MC683XX_SERIAL_H) */