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

Commit a92bc5a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Sparc fixes from David Miller:
 "One build regression and one serial probe regression fix on sparc."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  serial/sunzilog: fix keyboard on SUN SPARCstation
  sparc: pgtable_64: change include order
parents 167d8215 ca6f327d

arch/sparc/include/asm/pgtable_64.h

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
 * the SpitFire page tables.

 */



#include <asm-generic/pgtable-nopud.h>



#include <linux/compiler.h>

#include <linux/const.h>

#include <asm/types.h>
@@ -22,6 +20,8 @@ 
#include <asm/page.h>

#include <asm/processor.h>



#include <asm-generic/pgtable-nopud.h>



/* The kernel image occupies 0x4000000 to 0x6000000 (4MB --> 96MB).

 * The page copy blockops can use 0x6000000 to 0x8000000.

 * The TSB is mapped in the 0x8000000 to 0xa000000 range.

drivers/tty/serial/sunzilog.c

+2 −2
Original line number Diff line number Diff line
@@ -1581,7 +1581,7 @@ static int __init sunzilog_init(void) 
	if (err)

		goto out_unregister_uart;



	if (!zilog_irq) {

	if (zilog_irq) {

		struct uart_sunzilog_port *up = sunzilog_irq_chain;

		err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,

				  "zs", sunzilog_irq_chain);
@@ -1622,7 +1622,7 @@ static void __exit sunzilog_exit(void) 
{

	platform_driver_unregister(&zs_driver);



	if (!zilog_irq) {

	if (zilog_irq) {

		struct uart_sunzilog_port *up = sunzilog_irq_chain;



		/* Disable Interrupts */