diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-08 12:15:50 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-08 12:15:50 +0100 |
commit | 4e37fd4d5dfd39f547b0b00fa184a440a1e44b96 (patch) | |
tree | 1f2a678cce5422703aa376ab3506f430d51f89da /drivers/i2c/busses/i2c-sprd.c | |
parent | ARM: cpuidle: Refactor rollback operations if init fails (diff) | |
parent | PM / QoS: Fix device resume latency framework (diff) | |
download | linux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.tar.xz linux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.zip |
Merge branch 'pm-qos' into pm-cpuidle
Diffstat (limited to 'drivers/i2c/busses/i2c-sprd.c')
-rw-r--r-- | drivers/i2c/busses/i2c-sprd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c index 22e08ae1704f..25fcc3c1e32b 100644 --- a/drivers/i2c/busses/i2c-sprd.c +++ b/drivers/i2c/busses/i2c-sprd.c @@ -627,6 +627,7 @@ static const struct dev_pm_ops sprd_i2c_pm_ops = { static const struct of_device_id sprd_i2c_of_match[] = { { .compatible = "sprd,sc9860-i2c", }, + {}, }; static struct platform_driver sprd_i2c_driver = { |