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

Commit 26cf4457 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: select ARCH_NO_SYSDEV_OPS.
  sh: fix build error in board-sh7757lcr.c
  sh: landisk: Remove whitespace
  sh: landisk: Remove mv_nr_irqs
  sh: sh-sci: Fix double initialization by serial_console_setup
  serial: sh-sci: prevent setup of uninitialized serial console
  dma: shdma: add checking the DMAOR_AE in sh_dmae_err
parents 8b9686ff 99b662e5

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config SUPERH 
	select RTC_LIB

	select GENERIC_ATOMIC64

	select GENERIC_IRQ_SHOW

	select ARCH_NO_SYSDEV_OPS

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast

arch/sh/boards/board-sh7757lcr.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/io.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <cpu/sh7757.h>

#include <asm/sh_eth.h>

#include <asm/heartbeat.h>

arch/sh/boards/mach-landisk/setup.c

+2 −3
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ static void __init landisk_setup(char **cmdline_p) 
 */

static struct sh_machine_vector mv_landisk __initmv = {

	.mv_name = "LANDISK",

	.mv_nr_irqs = 72,

	.mv_setup = landisk_setup,

	.mv_init_irq = init_landisk_IRQ,

};

drivers/dma/shdma.c

+6 −1
Original line number Diff line number Diff line
@@ -865,7 +865,12 @@ static unsigned int sh_dmae_reset(struct sh_dmae_device *shdev) 


static irqreturn_t sh_dmae_err(int irq, void *data)

{

	struct sh_dmae_device *shdev = data;



	if (dmaor_read(shdev) & DMAOR_AE)

		return IRQ_RETVAL(sh_dmae_reset(data));

	else

		return IRQ_NONE;

}



static void dmae_do_tasklet(unsigned long data)

drivers/tty/serial/sh-sci.c

+12 −13
Original line number Diff line number Diff line
@@ -1836,6 +1836,12 @@ static int __devinit serial_console_setup(struct console *co, char *options) 
	sci_port = &sci_ports[co->index];

	port = &sci_port->port;



	/*

	 * Refuse to handle uninitialized ports.

	 */

	if (!port->ops)

		return -ENODEV;



	ret = sci_remap_port(port);

	if (unlikely(ret != 0))

		return ret;
@@ -1866,13 +1872,6 @@ static struct console serial_console = { 
	.data		= &sci_uart_driver,

};



static int __init sci_console_init(void)

{

	register_console(&serial_console);

	return 0;

}

console_initcall(sci_console_init);



static struct console early_serial_console = {

	.name           = "early_ttySC",

	.write          = serial_console_write,
@@ -1901,18 +1900,18 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev) 
	register_console(&early_serial_console);

	return 0;

}



#define SCI_CONSOLE	(&serial_console)



#else

static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev)

{

	return -EINVAL;

}

#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */



#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE)

#define SCI_CONSOLE	(&serial_console)

#else

#define SCI_CONSOLE	0

#endif

#define SCI_CONSOLE	NULL



#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */



static char banner[] __initdata =

	KERN_INFO "SuperH SCI(F) driver initialized\n";