diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 19:44:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 19:44:18 -0500 |
| commit | 03cfdb86ac66677dbe76accae3f22c374a15b814 (patch) | |
| tree | 86c2f6cf5afbd85fdc183fcadab12bf142e9659c /sound | |
| parent | 4ec8f077e4dd51f713984669781e7b568b8c41e2 (diff) | |
| parent | ab598b6680f1e74c267d1547ee352f3e1e530f89 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Fix system calls on Cell entered with XER.SO=1
powerpc/cell: Fix GDB watchpoints, again
powerpc/mpic: Don't reset affinity for secondary MPIC on boot
powerpc/cell/axon-msi: Retry on missing interrupt
powerpc: Fix boot freeze on machine with empty memory node
powerpc: Fix IRQ assignment for some PCIe devices
powerpc/spufs: Fix spinning in spufs_ps_fault on signal
powerpc/mpc832x_rdb: fix swapped ethernet ids
powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610
powerpc/85xx: L2 cache size wrong in 8572DS dts
powerpc/virtex: Update defconfigs
powerpc/52xx: update defconfigs
xsysace: Fix driver to use resource_size_t instead of unsigned long
powerpc/virtex: fix various format/casting printk mismatches
powerpc/mpc5200: fix bestcomm Kconfig dependencies
powerpc/44x: Fix 460EX/460GT machine check handling
powerpc/40x: Limit allocable DRAM during early mapping
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index bba9546ba5f5..8d73edc56102 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -20,7 +20,8 @@ config SND_SOC_MPC8610_HPCD | |||
| 20 | 20 | ||
| 21 | config SND_SOC_MPC5200_I2S | 21 | config SND_SOC_MPC5200_I2S |
| 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" | 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" |
| 23 | depends on SND_SOC && PPC_MPC52xx && PPC_BESTCOMM | ||
| 23 | select SND_SOC_OF_SIMPLE | 24 | select SND_SOC_OF_SIMPLE |
| 24 | depends on SND_SOC && PPC_MPC52xx | 25 | select PPC_BESTCOMM_GEN_BD |
| 25 | help | 26 | help |
| 26 | Say Y here to support the MPC5200 PSCs in I2S mode. | 27 | Say Y here to support the MPC5200 PSCs in I2S mode. |