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

Commit 2e11665c authored Oct 23, 2006 by Linus Torvalds

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: Convert INTC2 to IRQ table registration.
  sh: Updates for irq-flow-type naming changes.
  sh: Add some missing board headers.
  sh: Fix exception_handling_table alignment.
  sh: Cleanup board header directories.
  sh: Remove board-specific ide.h headers.
  sh: Proper show_stack/show_trace() implementation.

parents 5cfc35cf 66a74057

arch/sh/boards/hp6xx/hp6xx_apm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/apm.h>		#include <asm/apm.h>
	#include <asm/adc.h>		#include <asm/adc.h>
	#include <asm/hp6xx/hp6xx.h>		#include <asm/hp6xx.h>

	#define SH7709_PGDR 0xa400012c		#define SH7709_PGDR 0xa400012c

arch/sh/boards/hp6xx/pm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@
	#include <linux/time.h>		#include <linux/time.h>
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/hd64461.h>		#include <asm/hd64461.h>
	#include <asm/hp6xx/hp6xx.h>		#include <asm/hp6xx.h>
	#include <asm/cpu/dac.h>		#include <asm/cpu/dac.h>
	#include <asm/pm.h>		#include <asm/pm.h>

arch/sh/boards/hp6xx/setup.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	#include <asm/hd64461.h>		#include <asm/hd64461.h>
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/hp6xx/hp6xx.h>		#include <asm/hp6xx.h>
	#include <asm/cpu/dac.h>		#include <asm/cpu/dac.h>

	#define SCPCR 0xa4000116		#define SCPCR 0xa4000116

arch/sh/boards/renesas/hs7751rvoip/io.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/pci.h>		#include <linux/pci.h>
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/hs7751rvoip/hs7751rvoip.h>		#include <asm/hs7751rvoip.h>
	#include <asm/addrspace.h>		#include <asm/addrspace.h>

	extern void area6_io8_base; / Area 6 8bit I/O Base address */		extern void area6_io8_base; / Area 6 8bit I/O Base address */

arch/sh/boards/renesas/hs7751rvoip/irq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	#include <linux/irq.h>		#include <linux/irq.h>
	#include <asm/io.h>		#include <asm/io.h>
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/hs7751rvoip/hs7751rvoip.h>		#include <asm/hs7751rvoip.h>

	static int mask_pos[] = {8, 9, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7};		static int mask_pos[] = {8, 9, 10, 11, 12, 13, 0, 1, 2, 3, 4, 5, 6, 7};