Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[deliverable/linux.git] / drivers / ptp / ptp_pch.c

diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 0b38ee1b0f85bd81bdef67eefc7d942c109a5fb3..375eb04c16ea4833d0858c0497b784ea475cbf37 100644 (file)
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -694,7 +694,7 @@ static DEFINE_PCI_DEVICE_TABLE(pch_ieee1588_pcidev_id) = {
        {0}
 };
 
-static struct pci_driver pch_pcidev = {
+static struct pci_driver pch_driver = {
        .name = KBUILD_MODNAME,
        .id_table = pch_ieee1588_pcidev_id,
        .probe = pch_probe,
@@ -705,7 +705,7 @@ static struct pci_driver pch_pcidev = {
 
 static void __exit ptp_pch_exit(void)
 {
-       pci_unregister_driver(&pch_pcidev);
+       pci_unregister_driver(&pch_driver);
 }
 
 static s32 __init ptp_pch_init(void)
@@ -713,7 +713,7 @@ static s32 __init ptp_pch_init(void)
        s32 ret;
 
        /* register the driver with the pci core */
-       ret = pci_register_driver(&pch_pcidev);
+       ret = pci_register_driver(&pch_driver);
 
        return ret;
 }