summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach/mcbsp.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-07 11:42:01 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-07 11:42:01 +0100
commitb9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f (patch)
tree0e0a579d5c2007dae38cd77eff4e60c1fd43fcf1 /arch/arm/plat-omap/include/mach/mcbsp.h
parent6a90d536feeccb2c84a2831252b1ed4642684da3 (diff)
parentc12abc012e18b362204345c323536f228d65c4db (diff)
downloadop-kernel-dev-b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f.zip
op-kernel-dev-b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f.tar.gz
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'arch/arm/plat-omap/include/mach/mcbsp.h')
-rw-r--r--arch/arm/plat-omap/include/mach/mcbsp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h
index bb154ea..57249bb 100644
--- a/arch/arm/plat-omap/include/mach/mcbsp.h
+++ b/arch/arm/plat-omap/include/mach/mcbsp.h
@@ -387,8 +387,8 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
int omap_mcbsp_request(unsigned int id);
void omap_mcbsp_free(unsigned int id);
-void omap_mcbsp_start(unsigned int id);
-void omap_mcbsp_stop(unsigned int id);
+void omap_mcbsp_start(unsigned int id, int tx, int rx);
+void omap_mcbsp_stop(unsigned int id, int tx, int rx);
void omap_mcbsp_xmit_word(unsigned int id, u32 word);
u32 omap_mcbsp_recv_word(unsigned int id);
OpenPOWER on IntegriCloud