diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-07-10 22:48:26 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-10 22:48:26 +0400 |
| commit | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (patch) | |
| tree | cea7ef733c50025496f554f114173e49e52d3028 /arch/arm/plat-omap/include | |
| parent | f67df6c670a8fcd3f63728afa2314e7eca653bd7 (diff) | |
| parent | 727e18b429e3badda12d1de74f492bfa363a2e94 (diff) | |
| download | linux-1ad920556f32a5a127397ca461d1a1faaf22c4e0.tar.xz | |
Merge branch 'cleanup-part-2' into devel-board
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mcbsp.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index 6c5350832407..9882c657b2d4 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h @@ -33,7 +33,7 @@ #define OMAP_MCBSP_PLATFORM_DEVICE(port_nr) \ static struct platform_device omap_mcbsp##port_nr = { \ .name = "omap-mcbsp-dai", \ - .id = OMAP_MCBSP##port_nr, \ + .id = port_nr - 1, \ } #define MCBSP_CONFIG_TYPE2 0x2 @@ -332,14 +332,6 @@ struct omap_mcbsp_reg_cfg { }; typedef enum { - OMAP_MCBSP1 = 0, - OMAP_MCBSP2, - OMAP_MCBSP3, - OMAP_MCBSP4, - OMAP_MCBSP5 -} omap_mcbsp_id; - -typedef enum { OMAP_MCBSP_WORD_8 = 0, OMAP_MCBSP_WORD_12, OMAP_MCBSP_WORD_16, @@ -385,8 +377,6 @@ struct omap_mcbsp { void __iomem *io_base; u8 id; u8 free; - omap_mcbsp_word_length rx_word_length; - omap_mcbsp_word_length tx_word_length; int rx_irq; int tx_irq; |