Merge tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / nv_tco.c

diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index 231e5b9d5c8e079ec424b9331aca90912f42efae..c028454be66ce9e682db1ecb16449427ca7d1900 100644 (file)
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -289,7 +289,7 @@ static struct miscdevice nv_tco_miscdev = {
  * register a pci_driver, because someone else might one day
  * want to register another driver on the same PCI id.
  */
-static DEFINE_PCI_DEVICE_TABLE(tco_pci_tbl) = {
+static const struct pci_device_id tco_pci_tbl[] = {
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS,
          PCI_ANY_ID, PCI_ANY_ID, },
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
@@ -471,7 +471,6 @@ static struct platform_driver nv_tco_driver = {
        .remove         = nv_tco_remove,
        .shutdown       = nv_tco_shutdown,
        .driver         = {
-               .owner  = THIS_MODULE,
                .name   = TCO_MODULE_NAME,
        },
 };