diff options
| -rw-r--r-- | arch/mips/jazz/setup.c | 4 | ||||
| -rw-r--r-- | include/asm-mips/vector.h | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index 3bbe3714e..b31db6c95 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c @@ -7,7 +7,7 @@ * * Copyright (C) 1996, 1997 by Ralf Baechle * - * $Id: setup.c,v 1.4 1997/07/29 17:57:06 ralf Exp $ + * $Id: setup.c,v 1.5 1997/12/01 17:57:24 ralf Exp $ */ #include <linux/init.h> #include <linux/ioport.h> @@ -106,7 +106,7 @@ __initfunc(void jazz_setup(void)) fd_cacheflush = jazz_fd_cacheflush; keyboard_setup = jazz_keyboard_setup; feature = &jazz_feature; // Will go away - port_base = JAZZ_PORT_BASE; + mips_io_port_base = JAZZ_PORT_BASE; isa_slot_offset = 0xe3000000; request_region(0x00,0x20,"dma1"); request_region(0x40,0x20,"timer"); diff --git a/include/asm-mips/vector.h b/include/asm-mips/vector.h index e3183b1de..5d5d40702 100644 --- a/include/asm-mips/vector.h +++ b/include/asm-mips/vector.h @@ -31,17 +31,17 @@ struct feature { /* * How to access the floppy DMA functions. */ - void (*fd_enable_dma)(void); - void (*fd_disable_dma)(void); - int (*fd_request_dma)(void); - void (*fd_free_dma)(void); - void (*fd_clear_dma_ff)(void); - void (*fd_set_dma_mode)(char mode); - void (*fd_set_dma_addr)(unsigned int a); - void (*fd_set_dma_count)(unsigned int count); - int (*fd_get_dma_residue)(void); - void (*fd_enable_irq)(void); - void (*fd_disable_irq)(void); + void (*fd_enable_dma)(int channel); + void (*fd_disable_dma)(int channel); + int (*fd_request_dma)(int channel); + void (*fd_free_dma)(int channel); + void (*fd_clear_dma_ff)(int channel); + void (*fd_set_dma_mode)(int channel, char mode); + void (*fd_set_dma_addr)(int channel, unsigned int a); + void (*fd_set_dma_count)(int channel, unsigned int count); + int (*fd_get_dma_residue)(int channel); + void (*fd_enable_irq)(int irq); + void (*fd_disable_irq)(int irq); /* * How to access the RTC register of the DS1287? */ |