Merge branch 'sh/dynamic-irq-cleanup' into sh-latest

Conflicts:
	drivers/sh/intc/dynamic.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc arch/sh/boards/Kconfig
Simple merge

diff --cc arch/sh/boards/mach-se/7722/setup.c
index 8f7f055,2ec0111..e04e2bc
--- 1/arch/sh/boards/mach-se/7722/setup.c
--- 2/arch/sh/boards/mach-se/7722/setup.c
+++ b/arch/sh/boards/mach-se/7722/setup.c
@@@ -15,8 -16,8 +16,9 @@@
  #include <linux/ata_platform.h>
  #include <linux/input.h>
  #include <linux/input/sh_keysc.h>
+ #include <linux/irqdomain.h>
  #include <linux/smc91x.h>
 +#include <linux/sh_intc.h>
  #include <mach-se/mach/se7722.h>
  #include <mach-se/mach/mrshpc.h>
  #include <asm/machvec.h>

diff --cc arch/sh/include/mach-se/mach/se7343.h
Simple merge

diff --cc arch/sh/include/mach-se/mach/se7722.h
index 201081e,5508dc4..637e7ac
--- 1/arch/sh/include/mach-se/mach/se7722.h
--- 2/arch/sh/include/mach-se/mach/se7722.h
+++ b/arch/sh/include/mach-se/mach/se7722.h
@@@ -78,15 -77,9 +78,9 @@@
  #define PORT_HIZCRC     0xA405015CUL
  
  /* IRQ */
 -#define IRQ0_IRQ        32
 -#define IRQ1_IRQ        33
 +#define IRQ0_IRQ        evt2irq(0x600)
 +#define IRQ1_IRQ        evt2irq(0x620)
  
- #define IRQ01_MODE      0xb1800000
- #define IRQ01_STS       0xb1800004
- #define IRQ01_MASK      0xb1800008
- 
- /* Bits in IRQ01_* registers */
- 
  #define SE7722_FPGA_IRQ_USB   0 /* IRQ0 */
  #define SE7722_FPGA_IRQ_SMC   1 /* IRQ0 */
  #define SE7722_FPGA_IRQ_MRSHPC0       2 /* IRQ1 */