diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /sound/soc/codecs/max98371.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'sound/soc/codecs/max98371.c')
| -rw-r--r-- | sound/soc/codecs/max98371.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c index cf0a39bb631a..02352ed8961c 100644 --- a/sound/soc/codecs/max98371.c +++ b/sound/soc/codecs/max98371.c | |||
| @@ -412,6 +412,7 @@ static int max98371_i2c_remove(struct i2c_client *client) | |||
| 412 | 412 | ||
| 413 | static const struct i2c_device_id max98371_i2c_id[] = { | 413 | static const struct i2c_device_id max98371_i2c_id[] = { |
| 414 | { "max98371", 0 }, | 414 | { "max98371", 0 }, |
| 415 | { } | ||
| 415 | }; | 416 | }; |
| 416 | 417 | ||
| 417 | MODULE_DEVICE_TABLE(i2c, max98371_i2c_id); | 418 | MODULE_DEVICE_TABLE(i2c, max98371_i2c_id); |