diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/scsi/NCR53c406a.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/scsi/NCR53c406a.c')
| -rw-r--r-- | drivers/scsi/NCR53c406a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c index e13d8a632..52a9196c6 100644 --- a/drivers/scsi/NCR53c406a.c +++ b/drivers/scsi/NCR53c406a.c @@ -52,7 +52,7 @@ #include <asm/irq.h> #include <linux/blk.h> -#include <asm/spinlock.h> +#include <linux/spinlock.h> #include "scsi.h" #include "hosts.h" #include "sd.h" @@ -461,8 +461,8 @@ static __inline__ int NCR53c406a_pio_write(unsigned char *request, } #endif USE_PIO -__initfunc(int -NCR53c406a_detect(Scsi_Host_Template * tpnt)){ +int __init +NCR53c406a_detect(Scsi_Host_Template * tpnt){ struct Scsi_Host *shpnt; #ifndef PORT_BASE int i; @@ -593,7 +593,7 @@ NCR53c406a_detect(Scsi_Host_Template * tpnt)){ } /* called from init/main.c */ -__initfunc(void NCR53c406a_setup(char *str, int *ints)) +void __init NCR53c406a_setup(char *str, int *ints) { static size_t setup_idx = 0; size_t i; @@ -1022,7 +1022,7 @@ static void chip_init() outb(SYNC_MODE, SYNCOFF); /* synchronous mode */ } -__initfunc(void calc_port_addr(void)) +void __init calc_port_addr(void) { /* Control Register Set 0 */ TC_LSB = (port_base+0x00); |