diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:04 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:04 +0000 |
| commit | 205082557c52a684897058a4eb57568ee9ba0a31 (patch) | |
| tree | b0face36fcc13165d64a7ba212f8ecc84bd510da /drivers/input/touchscreen/ar1021_i2c.c | |
| parent | 6d6267d9712d8d3ec5af042868ed4c2fe56cd917 (diff) | |
| parent | 9764536dc592144beee43c987fef45d2e91ca55c (diff) | |
Merge tag 'v3.18.102' into linux-linaro-lsk-v3.18lsk-v3.18-18.03linux-linaro-lsk-v3.18
This is the 3.18.102 stable release
Diffstat (limited to 'drivers/input/touchscreen/ar1021_i2c.c')
| -rw-r--r-- | drivers/input/touchscreen/ar1021_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ar1021_i2c.c b/drivers/input/touchscreen/ar1021_i2c.c index ba30578e296e..845bfda99d74 100644 --- a/drivers/input/touchscreen/ar1021_i2c.c +++ b/drivers/input/touchscreen/ar1021_i2c.c @@ -152,7 +152,7 @@ static int __maybe_unused ar1021_i2c_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(ar1021_i2c_pm, ar1021_i2c_suspend, ar1021_i2c_resume); static const struct i2c_device_id ar1021_i2c_id[] = { - { "MICROCHIP_AR1021_I2C", 0 }, + { "ar1021", 0 }, { }, }; MODULE_DEVICE_TABLE(i2c, ar1021_i2c_id); |