aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/mcbsp.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:48 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:02 -0500
commita8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (patch)
tree86901095aeb9e59815a6f95547cf68a9ec0b32e0 /arch/arm/plat-omap/mcbsp.c
parent088ef950dc0dd58d2f339e1616c9092fea923f06 (diff)
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
Replace ARCH_OMAP34XX with ARCH_OMAP3 Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
-rw-r--r--arch/arm/plat-omap/mcbsp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index f75767278fc3..c1eb61529394 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -198,7 +198,7 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)
198} 198}
199EXPORT_SYMBOL(omap_mcbsp_config); 199EXPORT_SYMBOL(omap_mcbsp_config);
200 200
201#ifdef CONFIG_ARCH_OMAP34XX 201#ifdef CONFIG_ARCH_OMAP3
202/* 202/*
203 * omap_mcbsp_set_tx_threshold configures how to deal 203 * omap_mcbsp_set_tx_threshold configures how to deal
204 * with transmit threshold. the threshold value and handler can be 204 * with transmit threshold. the threshold value and handler can be
@@ -1107,7 +1107,7 @@ void omap_mcbsp_set_spi_mode(unsigned int id,
1107} 1107}
1108EXPORT_SYMBOL(omap_mcbsp_set_spi_mode); 1108EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);
1109 1109
1110#ifdef CONFIG_ARCH_OMAP34XX 1110#ifdef CONFIG_ARCH_OMAP3
1111#define max_thres(m) (mcbsp->pdata->buffer_size) 1111#define max_thres(m) (mcbsp->pdata->buffer_size)
1112#define valid_threshold(m, val) ((val) <= max_thres(m)) 1112#define valid_threshold(m, val) ((val) <= max_thres(m))
1113#define THRESHOLD_PROP_BUILDER(prop) \ 1113#define THRESHOLD_PROP_BUILDER(prop) \
@@ -1246,7 +1246,7 @@ static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp)
1246#else 1246#else
1247static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {} 1247static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {}
1248static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) {} 1248static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) {}
1249#endif /* CONFIG_ARCH_OMAP34XX */ 1249#endif /* CONFIG_ARCH_OMAP3 */
1250 1250
1251/* 1251/*
1252 * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. 1252 * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.