diff options
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index d203f4da18a0..ede6afde7d2f 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -92,7 +92,7 @@ static const unsigned long omap1_mcbsp_port[][2] = {}; | |||
92 | static const int omap24xx_dma_reqs[][2] = { | 92 | static const int omap24xx_dma_reqs[][2] = { |
93 | { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, | 93 | { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, |
94 | { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, | 94 | { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, |
95 | #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) | 95 | #if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) |
96 | { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX }, | 96 | { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX }, |
97 | { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX }, | 97 | { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX }, |
98 | { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX }, | 98 | { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX }, |
@@ -113,7 +113,7 @@ static const int omap44xx_dma_reqs[][2] = { | |||
113 | static const int omap44xx_dma_reqs[][2] = {}; | 113 | static const int omap44xx_dma_reqs[][2] = {}; |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #if defined(CONFIG_ARCH_OMAP2420) | 116 | #if defined(CONFIG_SOC_OMAP2420) |
117 | static const unsigned long omap2420_mcbsp_port[][2] = { | 117 | static const unsigned long omap2420_mcbsp_port[][2] = { |
118 | { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1, | 118 | { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1, |
119 | OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 }, | 119 | OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 }, |
@@ -124,7 +124,7 @@ static const unsigned long omap2420_mcbsp_port[][2] = { | |||
124 | static const unsigned long omap2420_mcbsp_port[][2] = {}; | 124 | static const unsigned long omap2420_mcbsp_port[][2] = {}; |
125 | #endif | 125 | #endif |
126 | 126 | ||
127 | #if defined(CONFIG_ARCH_OMAP2430) | 127 | #if defined(CONFIG_SOC_OMAP2430) |
128 | static const unsigned long omap2430_mcbsp_port[][2] = { | 128 | static const unsigned long omap2430_mcbsp_port[][2] = { |
129 | { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR, | 129 | { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR, |
130 | OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR }, | 130 | OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR }, |