diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
| commit | 2faea5274f079630991800bd579f85a621f96ef5 (patch) | |
| tree | 4afb9032f0ae3a3e8b539e0abe40cda320989ac3 /sound/soc/fsl/Kconfig | |
| parent | 16c5ab1d3a6d1b11ed2966fa33a3a4fecd13a2bc (diff) | |
| parent | edac894389f9c9de2a1368c78809c824b343f3a5 (diff) | |
Merge branch 'for-linus' into for-next
Merge pending fixes that haven't pulled into 3.8.
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3b98159d9645..a210c8d7b4bc 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -108,18 +108,13 @@ if SND_IMX_SOC | |||
| 108 | config SND_SOC_IMX_SSI | 108 | config SND_SOC_IMX_SSI |
| 109 | tristate | 109 | tristate |
| 110 | 110 | ||
| 111 | config SND_SOC_IMX_PCM | ||
| 112 | tristate | ||
| 113 | |||
| 114 | config SND_SOC_IMX_PCM_FIQ | 111 | config SND_SOC_IMX_PCM_FIQ |
| 115 | bool | 112 | tristate |
| 116 | select FIQ | 113 | select FIQ |
| 117 | select SND_SOC_IMX_PCM | ||
| 118 | 114 | ||
| 119 | config SND_SOC_IMX_PCM_DMA | 115 | config SND_SOC_IMX_PCM_DMA |
| 120 | bool | 116 | tristate |
| 121 | select SND_SOC_DMAENGINE_PCM | 117 | select SND_SOC_DMAENGINE_PCM |
| 122 | select SND_SOC_IMX_PCM | ||
| 123 | 118 | ||
| 124 | config SND_SOC_IMX_AUDMUX | 119 | config SND_SOC_IMX_AUDMUX |
| 125 | tristate | 120 | tristate |