Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 5f17203520cbbebd20f9caf5c37d2eca647cac3c..364cd11456f6dc9985a10fc0ef46eb127722d293 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -359,7 +359,6 @@ struct ata_port_operations {
        void (*exec_command)(struct ata_port *ap, const struct ata_taskfile *tf);
        u8   (*check_status)(struct ata_port *ap);
        u8   (*check_altstatus)(struct ata_port *ap);
-       u8   (*check_err)(struct ata_port *ap);
        void (*dev_select)(struct ata_port *ap, unsigned int device);
 
        void (*phy_reset) (struct ata_port *ap);
@@ -446,7 +445,6 @@ extern void ata_noop_dev_select (struct ata_port *ap, unsigned int device);
 extern void ata_std_dev_select (struct ata_port *ap, unsigned int device);
 extern u8 ata_check_status(struct ata_port *ap);
 extern u8 ata_altstatus(struct ata_port *ap);
-extern u8 ata_chk_err(struct ata_port *ap);
 extern void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf);
 extern int ata_port_start (struct ata_port *ap);
 extern void ata_port_stop (struct ata_port *ap);