From: Ira Snyder <kernel@irasnyder.com>

This removes the extra definition of the .error_handler member
in the pata_rz1000 driver.

Signed-off-by: Ira W. Snyder <kernel@irasnyder.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/ata/pata_rz1000.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN drivers/ata/pata_rz1000.c~initializer-entry-defined-twice-in-pata_rz1000 drivers/ata/pata_rz1000.c
--- a/drivers/ata/pata_rz1000.c~initializer-entry-defined-twice-in-pata_rz1000
+++ a/drivers/ata/pata_rz1000.c
@@ -105,8 +105,6 @@ static struct ata_port_operations rz1000
 	.exec_command	= ata_exec_command,
 	.dev_select 	= ata_std_dev_select,
 
-	.error_handler	= rz1000_error_handler,
-
 	.bmdma_setup 	= ata_bmdma_setup,
 	.bmdma_start 	= ata_bmdma_start,
 	.bmdma_stop	= ata_bmdma_stop,
_