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

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix dreamcast build for IRQ changes.
  sh: Fix clock multiplier on SH7722.
  sh: Wire up kdump crash kernel exec in die().
  sh: sr.bl toggling around idle sleep.
  sh: disable genrtc support.
  fs: Kill sh dependency for binfmt_flat.
  sh: Disable psw support for R7785RP.
  sh: Fix page size alignment in __copy_user_page().
  sh: Fix up various compile warnings for SE boards.
  sh: Wire up signalfd/timerfd/eventfd syscalls.
  sh: revert addition of page fault notifiers
  spelling fixes: arch/sh/
  input: hp680_ts compile fixes.
  sh: landisk: Header cleanups.
  sh: landisk: rtc-rs5c313 support.
  sh: Kill off pmb slab cache destructor.
  sh: Fix up psw build rules for r7780rp.
  sh: Shut up compiler warnings in __do_page_fault().
parents 7992018d 31d106c6

arch/sh/boards/landisk/gio.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int gio_ioctl(struct inode *inode, struct file *filp, 
	}



	switch (cmd) {

	case GIODRV_IOCSGIOSETADDR:	/* addres set */

	case GIODRV_IOCSGIOSETADDR:	/* address set */

		addr = data;

		break;

arch/sh/boards/landisk/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -44,8 +44,14 @@ static struct platform_device cf_ide_device = { 
	},

};



static struct platform_device rtc_device = {

	.name		= "rs5c313",

	.id		= -1,

};



static struct platform_device *landisk_devices[] __initdata = {

	&cf_ide_device,

	&rtc_device,

};



static int __init landisk_devices_setup(void)

arch/sh/boards/renesas/r7780rp/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -3,5 +3,8 @@ 
#

irqinit-y			:= irq-r7780rp.o

irqinit-$(CONFIG_SH_R7785RP)	:= irq-r7785rp.o

obj-$(CONFIG_PUSH_SWITCH)	+= psw.o

obj-y				:= setup.o irq.o $(irqinit-y)



ifneq ($(CONFIG_SH_R7785RP),y)

obj-$(CONFIG_PUSH_SWITCH)	+= psw.o

endif

arch/sh/boards/snapgear/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void ds1302_writebyte(unsigned int addr, unsigned int val) 
static void ds1302_reset(void)

{

	unsigned long	flags;

	/* Hardware dependant reset/init */

	/* Hardware dependent reset/init */

	local_irq_save(flags);

	set_dirp(get_dirp() | RTC_RESET | RTC_IODATA | RTC_SCLK);

	set_dp(get_dp() & ~(RTC_RESET | RTC_IODATA | RTC_SCLK));

arch/sh/boards/superh/microdev/io.c

+3 −3
Original line number Diff line number Diff line
@@ -198,12 +198,12 @@ void microdev_outb(unsigned char b, unsigned long port) 
	/*

	 *	There is a board feature with the current SH4-202 MicroDev in

	 *	that the 2 byte enables (nBE0 and nBE1) are tied together (and

	 *	to the Chip Select Line (Ethernet_CS)). Due to this conectivity,

	 *	to the Chip Select Line (Ethernet_CS)). Due to this connectivity,

	 *	it is not possible to safely perform 8-bit writes to the

	 *	Ethernet registers, as 16-bits will be consumed from the Data

	 *	lines (corrupting the other byte).  Hence, this function is

	 *	written to impliment 16-bit read/modify/write for all byte-wide

	 *	acceses.

	 *	written to implement 16-bit read/modify/write for all byte-wide

	 *	accesses.

	 *

	 *	Note: there is no problem with byte READS (even or odd).

	 *