diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sgiseeq.c | 5 | ||||
| -rw-r--r-- | drivers/scsi/sgiwd93.c | 17 | ||||
| -rw-r--r-- | drivers/sgi/char/sgiserial.c | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index 401b393f6..c04922287 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c @@ -1,4 +1,4 @@ -/* $Id: sgiseeq.c,v 1.8 1998/08/25 09:17:45 ralf Exp $ +/* $Id: sgiseeq.c,v 1.9 1998/10/14 23:40:46 ralf Exp $ * * sgiseeq.c: Seeq8003 ethernet driver for SGI machines. * @@ -32,6 +32,7 @@ #include <linux/skbuff.h> #include <asm/sgihpc.h> +#include <asm/sgint23.h> #include <asm/sgialib.h> #include "sgiseeq.h" @@ -738,5 +739,5 @@ int sgiseeq_probe(struct device *dev) str2eaddr(onboard_eth_addr, ep); return sgiseeq_init(dev, (struct sgiseeq_regs *) (KSEG1ADDR(0x1fbd4000)), - &hpc3c0->ethregs, 3); + &hpc3c0->ethregs, SGI_ENET_IRQ); } diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index 8f809b530..ed3d93287 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c @@ -7,7 +7,7 @@ * * (In all truth, Jed Schimmel wrote all this code.) * - * $Id: sgiwd93.c,v 1.13 1999/03/28 23:06:06 tsbogend Exp $ + * $Id: sgiwd93.c,v 1.14 1999/08/02 17:34:29 andrewb Exp $ */ #include <linux/init.h> #include <linux/types.h> @@ -281,7 +281,7 @@ __initfunc(int sgiwd93_detect(Scsi_Host_Template *HPsUX)) sgiwd93_host = scsi_register(HPsUX, sizeof(struct WD33C93_hostdata)); sgiwd93_host->base = (unsigned char *) hregs; - sgiwd93_host->irq = 1; + sgiwd93_host->irq = SGI_WD93_0_IRQ; buf = (uchar *) get_free_page(GFP_KERNEL); init_hpc_chain(buf); @@ -295,12 +295,12 @@ __initfunc(int sgiwd93_detect(Scsi_Host_Template *HPsUX)) hdata->dma_bounce_buffer = (uchar *) (KSEG1ADDR(buf)); dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE); - request_irq(1, sgiwd93_intr, 0, "SGI WD93", (void *) sgiwd93_host); + request_irq(SGI_WD93_0_IRQ, sgiwd93_intr, 0, "SGI WD93", (void *) sgiwd93_host); /* set up second controller on the Indigo2 */ if(!sgi_guiness) { sgiwd93_host1 = scsi_register(HPsUX, sizeof(struct WD33C93_hostdata)); sgiwd93_host1->base = (unsigned char *) hregs1; - sgiwd93_host1->irq = 2; + sgiwd93_host1->irq = SGI_WD93_1_IRQ; buf = (uchar *) get_free_page(GFP_KERNEL); init_hpc_chain(buf); @@ -314,7 +314,7 @@ __initfunc(int sgiwd93_detect(Scsi_Host_Template *HPsUX)) hdata1->dma_bounce_buffer = (uchar *) (KSEG1ADDR(buf)); dma_cache_wback_inv((unsigned long) buf, PAGE_SIZE); - request_irq(2, sgiwd93_intr, 0, "SGI WD93", (void *) sgiwd93_host1); + request_irq(SGI_WD93_1_IRQ, sgiwd93_intr, 0, "SGI WD93", (void *) sgiwd93_host1); } called = 1; @@ -337,9 +337,14 @@ Scsi_Host_Template driver_template = SGIWD93_SCSI; int sgiwd93_release(struct Scsi_Host *instance) { #ifdef MODULE - free_irq(1, sgiwd93_intr); + free_irq(SGI_WD93_0_IRQ, sgiwd93_intr); free_page(KSEG0ADDR(hdata->dma_bounce_buffer)); wd33c93_release(); + if(!sgi_guiness) { + free_irq(SGI_WD93_1_IRQ, sgiwd93_intr); + free_page(KSEG0ADDR(hdata1->dma_bounce_buffer)); + wd33c93_release(); + } #endif return 1; } diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c index 4178891ce..f779253b0 100644 --- a/drivers/sgi/char/sgiserial.c +++ b/drivers/sgi/char/sgiserial.c @@ -44,7 +44,7 @@ struct sgi_zschannel *zs_kgdbchan; struct sgi_serial zs_soft[NUM_CHANNELS]; struct sgi_serial *zs_chain; /* IRQ servicing chain */ -static int zilog_irq = 21; +static int zilog_irq = SGI_SERIAL_IRQ; /* Console hooks... */ static int zs_cons_chanout = 0; |