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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sunxvr1000: Add missing FB=y depenency.
  MAINTAINERS: Add entry for sparc serial drivers.
  drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields
parents 1097d7ce f04e879b

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -5214,6 +5214,21 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git 
S:	Maintained

F:	arch/sparc/



SPARC SERIAL DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

L:	sparclinux@vger.kernel.org

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git

S:	Maintained

F:	drivers/serial/suncore.c

F:	drivers/serial/suncore.h

F:	drivers/serial/sunhv.c

F:	drivers/serial/sunsab.c

F:	drivers/serial/sunsab.h

F:	drivers/serial/sunsu.c

F:	drivers/serial/sunzilog.c

F:	drivers/serial/sunzilog.h



SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER

M:	Roger Wolff <R.E.Wolff@BitWizard.nl>

S:	Supported

drivers/serial/sunsab.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static void sunsab_stop_rx(struct uart_port *port) 
{

	struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;



	up->interrupt_mask0 |= SAB82532_ISR0_TCD;

	up->interrupt_mask0 |= SAB82532_IMR0_TCD;

	writeb(up->interrupt_mask1, &up->regs->w.imr0);

}

drivers/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ config FB_XVR2500 


config FB_XVR1000

	bool "Sun XVR-1000 support"

	depends on SPARC64

	depends on (FB = y) && SPARC64

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

CRA Git | Maintained and supported by SUSTech CRA and CCSE