diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-22 16:36:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-22 16:36:33 -0800 |
| commit | 490a6e245e36ce27e10c32e1c3129fd782d3d1f3 (patch) | |
| tree | aa9aa577215f65fc775ced09a99d5ce02e02d2a5 /include | |
| parent | 66c669baa7d70b8d135da67f36c8dba12cea71b8 (diff) | |
| parent | ec7080d185a9b79581bf1dbe300e877719c0b1a9 (diff) | |
| download | linux-490a6e245e36ce27e10c32e1c3129fd782d3d1f3.tar.gz linux-490a6e245e36ce27e10c32e1c3129fd782d3d1f3.tar.bz2 linux-490a6e245e36ce27e10c32e1c3129fd782d3d1f3.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[PATCH] make au1xxx-ide compile again
[MIPS] Hack for SB1 cache issues
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 301e71300779..e9fa252f8a3f 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 */ |