diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /arch/ia64/sn | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'arch/ia64/sn')
| -rw-r--r-- | arch/ia64/sn/sn1/irq.c | 14 | ||||
| -rw-r--r-- | arch/ia64/sn/sn1/machvec.c | 4 | ||||
| -rw-r--r-- | arch/ia64/sn/sn1/setup.c | 1 |
3 files changed, 6 insertions, 13 deletions
diff --git a/arch/ia64/sn/sn1/irq.c b/arch/ia64/sn/sn1/irq.c index df8e56943..a8270fd2a 100644 --- a/arch/ia64/sn/sn1/irq.c +++ b/arch/ia64/sn/sn1/irq.c @@ -1,9 +1,10 @@ #include <linux/kernel.h> +#include <linux/sched.h> +#include <linux/irq.h> -#include <asm/irq.h> #include <asm/ptrace.h> -static int +static unsigned int sn1_startup_irq(unsigned int irq) { return(0); @@ -24,23 +25,16 @@ sn1_enable_irq(unsigned int irq) { } -static int -sn1_handle_irq(unsigned int irq, struct pt_regs *regs) -{ - return(0); -} - struct hw_interrupt_type irq_type_sn1 = { "sn1_irq", sn1_startup_irq, sn1_shutdown_irq, - sn1_handle_irq, sn1_enable_irq, sn1_disable_irq }; void -sn1_irq_init (struct irq_desc desc[NR_IRQS]) +sn1_irq_init (void) { int i; diff --git a/arch/ia64/sn/sn1/machvec.c b/arch/ia64/sn/sn1/machvec.c index 2e36b2e08..409d9a2ea 100644 --- a/arch/ia64/sn/sn1/machvec.c +++ b/arch/ia64/sn/sn1/machvec.c @@ -1,4 +1,2 @@ +#define MACHVEC_PLATFORM_NAME sn1 #include <asm/machvec_init.h> -#include <asm/machvec_sn1.h> - -MACHVEC_DEFINE(sn1) diff --git a/arch/ia64/sn/sn1/setup.c b/arch/ia64/sn/sn1/setup.c index 45242fc26..7b397bb6b 100644 --- a/arch/ia64/sn/sn1/setup.c +++ b/arch/ia64/sn/sn1/setup.c @@ -13,6 +13,7 @@ #include <linux/console.h> #include <linux/timex.h> #include <linux/sched.h> +#include <linux/ioport.h> #include <asm/io.h> #include <asm/machvec.h> |