Merge branch 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / ptp / ptp_pch.c

diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 9e397fe5ed121e42df2ca812372ac6195342365e..3a9c17eced10c3a34d591fd465db555ec9498b88 100644 (file)
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/ptp_clock_kernel.h>
+#include <linux/slab.h>
 
 #define STATION_ADDR_LEN       20
 #define PCI_DEVICE_ID_PCH_1588 0x8819
@@ -652,8 +653,6 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        iowrite32(1, &chip->regs->trgt_lo);
        iowrite32(0, &chip->regs->trgt_hi);
        iowrite32(PCH_TSE_TTIPEND, &chip->regs->event);
-       /* Version: IEEE1588 v1 and IEEE1588-2008,  Mode: All Evwnt, Locked  */
-       iowrite32(0x80020000, &chip->regs->ch_control);
 
        pch_eth_enable_set(chip);