Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

[firefly-linux-kernel-4.4.55.git] / drivers / ata / libata-eh.c

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 77fc80640e261507583ae3917f1abc0a36b2c726..7d4535e989bf5580d76909c2402460898ff86062 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -419,7 +419,7 @@ int ata_ering_map(struct ata_ering *ering,
        return rc;
 }
 
-int ata_ering_clear_cb(struct ata_ering_entry *ent, void *void_arg)
+static int ata_ering_clear_cb(struct ata_ering_entry *ent, void *void_arg)
 {
        ent->eflags |= ATA_EFLAG_OLD_ER;
        return 0;