diff options
| author | Manuel Lauss <mano@roarinelk.homelinux.net> | 2006-11-22 14:51:32 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-11-22 23:34:02 +0000 |
| commit | ec7080d185a9b79581bf1dbe300e877719c0b1a9 (patch) | |
| tree | 7c5fea8e4b4a7f38f277d8dbffdc5739ce9082bc /include | |
| parent | eb4828750852b84703f64747b3bedf6394d629ef (diff) | |
| download | kernel_samsung_aries-ec7080d185a9b79581bf1dbe300e877719c0b1a9.zip kernel_samsung_aries-ec7080d185a9b79581bf1dbe300e877719c0b1a9.tar.gz kernel_samsung_aries-ec7080d185a9b79581bf1dbe300e877719c0b1a9.tar.bz2 | |
[PATCH] make au1xxx-ide compile again
The Au1xx IDE controller driver doesn't compile:
CC drivers/ide/mips/au1xxx-ide.o
/linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:480: error: conflicting types for 'auide_ddma_tx_callback'
include2/asm/mach-au1x00/au1xxx_ide.h:174: error: previous declaration of 'auide_ddma_tx_callback' was here
/linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:486: error: conflicting types for 'auide_ddma_rx_callback'
include2/asm/mach-au1x00/au1xxx_ide.h:176: error: previous declaration of 'auide_ddma_rx_callback' was here
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx_ide.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/include/asm-mips/mach-au1x00/au1xxx_ide.h index 301e713..e9fa252 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_ide.h +++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h @@ -170,10 +170,8 @@ int __init auide_probe(void); static int auide_dma_host_on(ide_drive_t *drive); static int auide_dma_lostirq(ide_drive_t *drive); static int auide_dma_on(ide_drive_t *drive); - static void auide_ddma_tx_callback(int irq, void *param, - struct pt_regs *regs); - static void auide_ddma_rx_callback(int irq, void *param, - struct pt_regs *regs); + static void auide_ddma_tx_callback(int irq, void *param); + static void auide_ddma_rx_callback(int irq, void *param); static int auide_dma_off_quietly(ide_drive_t *drive); #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ |