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/block/alim15x3.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/block/alim15x3.c')
| -rw-r--r-- | drivers/block/alim15x3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/alim15x3.c b/drivers/block/alim15x3.c index 4ea590fa2..b7a0a5c4f 100644 --- a/drivers/block/alim15x3.c +++ b/drivers/block/alim15x3.c @@ -110,7 +110,7 @@ static void ali15x3_tune_drive (ide_drive_t *drive, byte pio) } -__initfunc(unsigned int pci_init_ali15x3 (struct pci_dev *dev, const char *name)) +unsigned int __init pci_init_ali15x3 (struct pci_dev *dev, const char *name) { byte confreg0 = 0, confreg1 =0, progif = 0; int errors = 0; @@ -194,7 +194,7 @@ int ali15x3_dmaproc (ide_dma_action_t func, ide_drive_t *drive) return ide_dmaproc(func, drive); /* use standard DMA stuff */ } -__initfunc(void ide_init_ali15x3 (ide_hwif_t *hwif)) +void __init ide_init_ali15x3 (ide_hwif_t *hwif) { struct pci_dev *dev; byte ideic, inmir, iderev; |