Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / drivers / mfd / intel_soc_pmic_core.c

diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
index a00ddd93dc15f250847f81e136edd4454ea33895..d9e15cf7c6c8839ba09b6e505730f62b5820798d 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_core.c
+++ b/drivers/mfd/intel_soc_pmic_core.c
@@ -176,7 +176,7 @@ static const struct i2c_device_id intel_soc_pmic_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, intel_soc_pmic_i2c_id);
 
 #if defined(CONFIG_ACPI)
-static struct acpi_device_id intel_soc_pmic_acpi_match[] = {
+static const struct acpi_device_id intel_soc_pmic_acpi_match[] = {
        {"INT33FD", (kernel_ulong_t)&intel_soc_pmic_config_crc},
        { },
 };
@@ -186,7 +186,6 @@ MODULE_DEVICE_TABLE(acpi, intel_soc_pmic_acpi_match);
 static struct i2c_driver intel_soc_pmic_i2c_driver = {
        .driver = {
                .name = "intel_soc_pmic_i2c",
-               .owner = THIS_MODULE,
                .pm = &intel_soc_pmic_pm_ops,
                .acpi_match_table = ACPI_PTR(intel_soc_pmic_acpi_match),
        },