aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>2010-08-04 08:42:43 -0400
committerGreg Ungerer <gerg@uclinux.org>2010-10-20 20:17:29 -0400
commit713e919e09492342eb8cd56f5aa7e3b33f672968 (patch)
tree1d9995cf4c11eef6f53833a5b0d85840bb7ea9be
parent4a33fbcb3cdb0172e6e355a4ced3ca4d16622ffd (diff)
arch/m68knommu: Removing dead 68328_SERIAL_UART2 config option
CONFIG_68328_SERIAL_UART2 doesn't exist in Kconfig, therefore removing all references to it from the source. Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r--arch/m68knommu/platform/68VZ328/config.c5
-rw-r--r--drivers/serial/68328serial.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68knommu/platform/68VZ328/config.c b/arch/m68knommu/platform/68VZ328/config.c
index fc5c63054e98..eabaabe8af36 100644
--- a/arch/m68knommu/platform/68VZ328/config.c
+++ b/arch/m68knommu/platform/68VZ328/config.c
@@ -90,11 +90,6 @@ static void init_hardware(char *command, int size)
90 PDIQEG &= ~PD(1); 90 PDIQEG &= ~PD(1);
91 PDIRQEN |= PD(1); /* IRQ enabled */ 91 PDIRQEN |= PD(1); /* IRQ enabled */
92 92
93#ifdef CONFIG_68328_SERIAL_UART2
94 /* Enable RXD TXD port bits to enable UART2 */
95 PJSEL &= ~(PJ(5) | PJ(4));
96#endif
97
98#ifdef CONFIG_INIT_LCD 93#ifdef CONFIG_INIT_LCD
99 /* initialize LCD controller */ 94 /* initialize LCD controller */
100 LSSA = (long) screen_bits; 95 LSSA = (long) screen_bits;
diff --git a/drivers/serial/68328serial.h b/drivers/serial/68328serial.h
index 58aa2154655b..664ceb0a158c 100644
--- a/drivers/serial/68328serial.h
+++ b/drivers/serial/68328serial.h
@@ -181,13 +181,8 @@ struct m68k_serial {
181/* 181/*
182 * Define the number of ports supported and their irqs. 182 * Define the number of ports supported and their irqs.
183 */ 183 */
184#ifndef CONFIG_68328_SERIAL_UART2
185#define NR_PORTS 1 184#define NR_PORTS 1
186#define UART_IRQ_DEFNS {UART_IRQ_NUM} 185#define UART_IRQ_DEFNS {UART_IRQ_NUM}
187#else
188#define NR_PORTS 2
189#define UART_IRQ_DEFNS {UART1_IRQ_NUM, UART2_IRQ_NUM}
190#endif
191 186
192#endif /* __KERNEL__ */ 187#endif /* __KERNEL__ */
193#endif /* !(_MC683XX_SERIAL_H) */ 188#endif /* !(_MC683XX_SERIAL_H) */