lkml.org 
[lkml]   [2017]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the sound-asoc tree with the sound-current tree
On Fri, 25 Aug 2017 11:37:29 +0200,
Andy Shevchenko wrote:
>
> 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.

Right. Mark, could you fix in your tree?


thanks,

Takashi

\
 
 \ /
  Last update: 2017-08-25 11:40    [W:0.057 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site