Merge core/lib: pick up memparse() change.

Merge branch 'core/lib' into x86/xen

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 5b6e5395c8eb..d51a2a4b43eb 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2083,7 +2083,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                 if (iocbq_entry == NULL) {
                         printk(KERN_ERR "%s: only allocated %d iocbs of "
                                 "expected %d count. Unloading driver.\n",
-                                __FUNCTION__, i, LPFC_IOCB_LIST_CNT);
+                                __func__, i, LPFC_IOCB_LIST_CNT);
                         error = -ENOMEM;
                         goto out_free_iocbq;
                 }
@@ -2093,7 +2093,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                         kfree (iocbq_entry);
                         printk(KERN_ERR "%s: failed to allocate IOTAG. "
                                "Unloading driver.\n",
-                                __FUNCTION__);
+                                __func__);
                         error = -ENOMEM;
                         goto out_free_iocbq;
                 }