diff --git a/[refs] b/[refs] index a0763ec58cb2..f2f1c287fc54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 305c891e2a5ef6bc8d6399cd7178771224feac25 +refs/heads/master: 5c0a42566c153349521ac5ff68561c29d2d261bf diff --git a/trunk/drivers/ptp/ptp_pch.c b/trunk/drivers/ptp/ptp_pch.c index e624e4dd2abb..304cec21bc42 100644 --- a/trunk/drivers/ptp/ptp_pch.c +++ b/trunk/drivers/ptp/ptp_pch.c @@ -581,7 +581,7 @@ static void __devexit pch_remove(struct pci_dev *pdev) dev_info(&pdev->dev, "complete\n"); } -static s32 __devinit +static s32 pch_probe(struct pci_dev *pdev, const struct pci_device_id *id) { s32 ret;