diff options
Diffstat (limited to 'arch/sh/boards')
| -rw-r--r-- | arch/sh/boards/landisk/irq.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/renesas/r7780rp/irq.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/renesas/systemh/setup.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/se/7343/irq.c | 2 | ||||
| -rw-r--r-- | arch/sh/boards/se/770x/setup.c | 7 | ||||
| -rw-r--r-- | arch/sh/boards/se/7751/setup.c | 6 | ||||
| -rw-r--r-- | arch/sh/boards/sh03/setup.c | 1 |
7 files changed, 9 insertions, 13 deletions
diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c index a006d6443225..5891fcd80405 100644 --- a/arch/sh/boards/landisk/irq.c +++ b/arch/sh/boards/landisk/irq.c @@ -83,7 +83,7 @@ static struct hw_interrupt_type landisk_irq_type = { static void make_landisk_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &landisk_irq_type; + irq_desc[irq].chip = &landisk_irq_type; disable_landisk_irq(irq); } diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c index 61d5e5d3c294..769ae6b65123 100644 --- a/arch/sh/boards/renesas/r7780rp/irq.c +++ b/arch/sh/boards/renesas/r7780rp/irq.c @@ -83,7 +83,7 @@ static struct hw_interrupt_type r7780rp_irq_type = { static void make_r7780rp_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &r7780rp_irq_type; + irq_desc[irq].chip = &r7780rp_irq_type; disable_r7780rp_irq(irq); } diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c index a8467bf90c25..bab7d3cdc87b 100644 --- a/arch/sh/boards/renesas/systemh/setup.c +++ b/arch/sh/boards/renesas/systemh/setup.c @@ -53,6 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = { .mv_outsw = sh7751systemh_outsw, .mv_outsl = sh7751systemh_outsl, - .mv_init_irq = sh7751system_init_irq, + .mv_init_irq = sh7751systemh_init_irq, }; ALIAS_MV(7751systemh) diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/se/7343/irq.c index b41e3d4ea37c..739a7b001bb7 100644 --- a/arch/sh/boards/se/7343/irq.c +++ b/arch/sh/boards/se/7343/irq.c @@ -73,7 +73,7 @@ static void make_intreq_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &intreq_irq_type; + irq_desc[irq].chip = &intreq_irq_type; disable_intreq_irq(irq); } diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c index f3f82b7c8217..a1d51d5fa925 100644 --- a/arch/sh/boards/se/770x/setup.c +++ b/arch/sh/boards/se/770x/setup.c @@ -8,13 +8,10 @@ * */ #include <linux/init.h> -#include <linux/irq.h> -#include <linux/hdreg.h> -#include <linux/ide.h> -#include <asm/io.h> +#include <asm/machvec.h> #include <asm/se.h> +#include <asm/io.h> #include <asm/smc37c93x.h> -#include <asm/machvec.h> void heartbeat_se(void); void init_se_IRQ(void); diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c index 73e826310ba8..f7e1dd39c836 100644 --- a/arch/sh/boards/se/7751/setup.c +++ b/arch/sh/boards/se/7751/setup.c @@ -8,12 +8,10 @@ * Modified for 7751 Solution Engine by * Ian da Silva and Jeremy Siegel, 2001. */ - #include <linux/init.h> -#include <linux/irq.h> -#include <linux/ide.h> -#include <asm/io.h> +#include <asm/machvec.h> #include <asm/se7751.h> +#include <asm/io.h> void heartbeat_7751se(void); void init_7751se_IRQ(void); diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index 6c310587ddfe..137e2ba9243e 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c @@ -7,6 +7,7 @@ #include <linux/init.h> #include <linux/irq.h> +#include <linux/pci.h> #include <asm/io.h> #include <asm/rtc.h> #include <asm/sh03/io.h> |