Re: linux-next: manual merge of the sound-asoc tree with the sound-current tree

[Takashi Iwai]

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