5 files changed, 11 insertions, 11 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 17846f4ba9b6..73ec6aec5ed5 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -178,8 +178,6 @@ endchoice
 
 endmenu
 
-source "drivers/firmware/Kconfig"
-
 source "mm/Kconfig"
 
 config GENERIC_ISA_DMA
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index df5f2b0e0750..a1de06d76de6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -175,7 +175,7 @@ config MOXA_INTELLIO
 
 config MOXA_SMARTIO
         tristate "Moxa SmartIO support"
-        depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
+        depends on SERIAL_NONSTANDARD
         help
           Say Y here if you have a Moxa SmartIO multiport serial card.
 
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32
+        depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 && !SPARC64
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index f022f0944434..d0ef1ae41298 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -63,7 +63,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/segment.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index cd4fe8b1709f..63fff7c1244a 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -938,10 +938,9 @@ found:
 
         /*
          * XXX Interrupt pin #7 in Espresso is shared between RTC and
-         * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here
-         * is asking for trouble with add-on boards. Change to SA_SHIRQ.
+         * PCI Slot 2 INTA# (and some INTx# in Slot 1).
          */
-        if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) {
+        if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) {
                 /*
                  * Standard way for sparc to print irq's is to use
                  * __irq_itoa(). I think for EBus it's ok to use %d.
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 0cc879eb1c02..5959e6755a81 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -269,7 +269,10 @@ static void sunsu_stop_tx(struct uart_port *port)
 
         __stop_tx(up);
 
-        if (up->port.type == PORT_16C950 && tty_stop /*FIXME*/) {
+        /*
+         * We really want to stop the transmitter from sending.
+         */
+        if (up->port.type == PORT_16C950) {
                 up->acr |= UART_ACR_TXDIS;
                 serial_icr_write(up, UART_ACR, up->acr);
         }
@@ -283,10 +286,11 @@ static void sunsu_start_tx(struct uart_port *port)
                 up->ier |= UART_IER_THRI;
                 serial_out(up, UART_IER, up->ier);
         }
+
         /*
-         * We only do this from uart_start
+         * Re-enable the transmitter if we disabled it.
          */
-        if (tty_start && up->port.type == PORT_16C950 /*FIXME*/) {
+        if (up->port.type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
                 up->acr &= ~UART_ACR_TXDIS;
                 serial_icr_write(up, UART_ACR, up->acr);
         }