Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1719863
| From | Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree |
| Date | 2017-08-25 11:40 +0200 |
| Message-ID | <uijfQ-2gM-21@gated-at.bofh.it> (permalink) |
| References | <uid0J-6Iw-5@gated-at.bofh.it> |
| Organization | Intel Finland Oy |
On Fri, 2017-08-25 at 12:57 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in:
>
> sound/soc/codecs/rt5677.c
>
> between commit:
>
> 9ce76511b67b ("ASoC: rt5677: Reintroduce I2C device IDs")
This one AFAIU is a quick fix solely for v4.13.
Thus, the correct fix is to remove all 3 IDs from that table to get:
static const struct i2c_device_id rt5677_i2c_id[] = {
{ }
};
MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);
at the end.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the sound-asoc tree with the sound-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-25 05:00 +0200
Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-08-25 11:40 +0200
Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree Takashi Iwai <tiwai@suse.de> - 2017-08-25 11:50 +0200
Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-25 13:10 +0200
csiph-web