pilppa.com Git - linux-2.6-omap-h63xx.git/commit

author	Manuel Lauss <mano@roarinelk.homelinux.net>
	Wed, 22 Nov 2006 13:51:32 +0000 (14:51 +0100)
committer	Ralf Baechle <ralf@linux-mips.org>
	Wed, 22 Nov 2006 23:34:02 +0000 (23:34 +0000)
commit	ec7080d185a9b79581bf1dbe300e877719c0b1a9
tree	7c5fea8e4b4a7f38f277d8dbffdc5739ce9082bc	tree \| snapshot
parent	eb4828750852b84703f64747b3bedf6394d629ef	commit \| diff

[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>