| Message ID | 1400163836-9831-7-git-send-email-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d02a47b99748a073741e5c30aaefea9cabd94c6a |
| Headers | show |
On 15/05/14 15:23, Andrew Lunn wrote: > mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Most of the descriptions in the series say remove mach-kirkwood and most of the actual patches remove ARCH_KIRKWOOD and leave MACH_KIRKWOOD untouched. Patch 01/11 hasn't turned up here so I'm not certain which you meant but consistency would be good. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > Cc: Mark Brown <broonie@kernel.org> > Cc: alsa-devel@alsa-project.org > --- > sound/soc/kirkwood/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig > index 1f7c7ee3527a..6a0f79d2bb33 100644 > --- a/sound/soc/kirkwood/Kconfig > +++ b/sound/soc/kirkwood/Kconfig > @@ -1,6 +1,6 @@ > config SND_KIRKWOOD_SOC > tristate "SoC Audio for the Marvell Kirkwood and Dove chips" > - depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST > + depends on ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST > help > Say Y or M if you want to add support for codecs attached to > the Kirkwood I2S interface. You will also need to select the > Regards Adam Baker
On Thu, May 15, 2014 at 11:01:14PM +0100, Adam Baker wrote: > On 15/05/14 15:23, Andrew Lunn wrote: > >mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. > > Most of the descriptions in the series say remove mach-kirkwood and > most of the actual patches remove ARCH_KIRKWOOD and leave > MACH_KIRKWOOD untouched. Patch 01/11 hasn't turned up here so I'm > not certain which you meant but consistency would be good. 01/11 is big, since it is an rm -fr arch/arm/mach-kirkwood. It is bigger than the list message size limit and so has been put to one side for the list moderator to approve. The comment is consistent with the code, the code is however somewhat confusing. arch/arm/mach-kirkwood uses ARCH_KIRKWOOD. kirkwood in its new home inside arch/arm/mach-mvebu uses MACH_KIRKWOOD. Andrew
On Thu, May 15, 2014 at 04:23:47PM +0200, Andrew Lunn wrote:
> mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Applied, thanks.
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig index 1f7c7ee3527a..6a0f79d2bb33 100644 --- a/sound/soc/kirkwood/Kconfig +++ b/sound/soc/kirkwood/Kconfig @@ -1,6 +1,6 @@ config SND_KIRKWOOD_SOC tristate "SoC Audio for the Marvell Kirkwood and Dove chips" - depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST + depends on ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST help Say Y or M if you want to add support for codecs attached to the Kirkwood I2S interface. You will also need to select the
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Cc: Mark Brown <broonie@kernel.org> Cc: alsa-devel@alsa-project.org --- sound/soc/kirkwood/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)