Merge tag 'v4.4-rc7'

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / vt8231.c

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index aee14e2192f8813dbb59dee615142db9505dcd9a..cb69a8c2ed5b84ba77d0053355ab2a649837e5f7 100644 (file)
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -759,14 +759,13 @@ static const struct attribute_group vt8231_group = {
 
 static struct platform_driver vt8231_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "vt8231",
        },
        .probe  = vt8231_probe,
        .remove = vt8231_remove,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(vt8231_pci_ids) = {
+static const struct pci_device_id vt8231_pci_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231_4) },
        { 0, }
 };