Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bdb2b6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 4c2cac89 c0f2f761

arch/sparc64/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -178,8 +178,6 @@ endchoice 


endmenu



source "drivers/firmware/Kconfig"



source "mm/Kconfig"



config GENERIC_ISA_DMA

drivers/char/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/char/mxser.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/char/rtc.c

+2 −3
Original line number Diff line number Diff line
@@ -938,10 +938,9 @@ static int __init rtc_init(void) 


	/*

	 * 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.

drivers/serial/sunsu.c

+7 −3
Original line number Diff line number Diff line
@@ -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);

	}