| Message ID | 20090628074158.26905.36950.stgit@localhost.localdomain (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Grant Likely |
| Headers | show |
On Sun, Jun 28, 2009 at 3:42 AM, Grant Likely<grant.likely@secretlab.ca> wrote: > From: Grant Likely <grant.likely@secretlab.ca> > > The needed spin_event_timeout() macro is now merged in from the > powerpc tree, so these drivers are no longer broken. This reverts > commit 0c0e09e21a9e7bc6ca54e06ef3d497255ca26383 (ASoC: Mark MPC5200 > AC97 as BROKEN until PowerPC merge issues are resolved) > > Tested against 2.6.31-rc1. > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Jon Smirl <jonsmirl@gmail.com> > --- > > sound/soc/fsl/Kconfig | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > > diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig > index 5661876..8cb65cc 100644 > --- a/sound/soc/fsl/Kconfig > +++ b/sound/soc/fsl/Kconfig > @@ -41,7 +41,7 @@ config SND_SOC_MPC5200_AC97 > > config SND_MPC52xx_SOC_PCM030 > tristate "SoC AC97 Audio support for Phytec pcm030 and WM9712" > - depends on PPC_MPC5200_SIMPLE && BROKEN > + depends on PPC_MPC5200_SIMPLE > select SND_SOC_MPC5200_AC97 > select SND_SOC_WM9712 > help > @@ -50,7 +50,7 @@ config SND_MPC52xx_SOC_PCM030 > > config SND_MPC52xx_SOC_EFIKA > tristate "SoC AC97 Audio support for bbplan Efika and STAC9766" > - depends on PPC_EFIKA && BROKEN > + depends on PPC_EFIKA > select SND_SOC_MPC5200_AC97 > select SND_SOC_STAC9766 > help > >
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 5661876..8cb65cc 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -41,7 +41,7 @@ config SND_SOC_MPC5200_AC97 config SND_MPC52xx_SOC_PCM030 tristate "SoC AC97 Audio support for Phytec pcm030 and WM9712" - depends on PPC_MPC5200_SIMPLE && BROKEN + depends on PPC_MPC5200_SIMPLE select SND_SOC_MPC5200_AC97 select SND_SOC_WM9712 help @@ -50,7 +50,7 @@ config SND_MPC52xx_SOC_PCM030 config SND_MPC52xx_SOC_EFIKA tristate "SoC AC97 Audio support for bbplan Efika and STAC9766" - depends on PPC_EFIKA && BROKEN + depends on PPC_EFIKA select SND_SOC_MPC5200_AC97 select SND_SOC_STAC9766 help