diff --git a/[refs] b/[refs] index 001e9f1a9ff1..46b7b2303e59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11ace0c1defc4d1fe78afd29319bedef36da7078 +refs/heads/master: 071d3ad37485a82e0543a503272c45cdd32053dd diff --git a/trunk/drivers/ata/ahci_platform.c b/trunk/drivers/ata/ahci_platform.c index 1d90690d85f7..1cc467bdb63d 100644 --- a/trunk/drivers/ata/ahci_platform.c +++ b/trunk/drivers/ata/ahci_platform.c @@ -49,12 +49,12 @@ static struct platform_device_id ahci_devtype[] = { }; MODULE_DEVICE_TABLE(platform, ahci_devtype); -struct ata_port_operations ahci_platform_ops = { +static struct ata_port_operations ahci_platform_ops = { .inherits = &ahci_ops, .host_stop = ahci_host_stop, }; -struct ata_port_operations ahci_platform_retry_srst_ops = { +static struct ata_port_operations ahci_platform_retry_srst_ops = { .inherits = &ahci_pmp_retry_srst_ops, .host_stop = ahci_host_stop, }; @@ -323,7 +323,7 @@ static int ahci_resume(struct device *dev) } #endif -SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_suspend, ahci_resume); +static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_suspend, ahci_resume); static const struct of_device_id ahci_of_match[] = { { .compatible = "snps,spear-ahci", },