Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / ata / pata_bf54x.c

diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 3d94c80..9cae65d 100644 (file)
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1214,7 +1214,7 @@ static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,
  *     bfin_irq_clear - Clear ATAPI interrupt.
  *     @ap: Port associated with this ATA transaction.
  *
- *     Note: Original code is ata_sff_irq_clear().
+ *     Note: Original code is ata_bmdma_irq_clear().
  */
 
 static void bfin_irq_clear(struct ata_port *ap)
@@ -1450,8 +1450,6 @@ static struct ata_port_operations bfin_pata_ops = {
 
        .port_start             = bfin_port_start,
        .port_stop              = bfin_port_stop,
-
-       .mode_filter            = ATA_OP_NULL,  /* will be removed soon */
 };
 
 static struct ata_port_info bfin_port_info[] = {