From: Ira Snyder <kernel@irasnyder.com>
Date: Fri, 15 Dec 2006 21:08:52 +0000 (-0800)
Subject: [PATCH] initializer entry defined twice in pata_rz1000
X-Git-Tag: v2.6.20-rc2~123^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0457882fed8af8580fb2f08183ea2dfbbc3ccac6;p=linux-2.6-omap-h63xx.git

[PATCH] initializer entry defined twice in pata_rz1000

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>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 3677c642c9f..adf4cc134f2 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -105,8 +105,6 @@ static struct ata_port_operations rz1000_port_ops = {
 	.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,