Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec7080d1 authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

[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: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent eb482875

include/asm-mips/mach-au1x00/au1xxx_ide.h

+2 −4
Original line number Diff line number Diff line
@@ -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 */