diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:44:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:44:47 -0700 |
| commit | 7de4a9a73563e5f6f3c153015fadee433a443241 (patch) | |
| tree | d70e27c20bc612c58ec123e581f2ce7c02553888 | |
| parent | 1097d7cef683c30f9768007daae2e961a0686a10 (diff) | |
| parent | f04e879bf296d136bcafd8c5a26e95599b141671 (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 15 | ||||
| -rw-r--r-- | drivers/serial/sunsab.c | 2 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 47cc449d89d..382eaa4d006 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index d514e28d075..d2e0321049e 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -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); } diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index dabe804ba57..feaff4f04b5 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -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 |