diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 12:39:58 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 12:39:58 +0000 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /arch/arm/plat-omap/include/mach/mcbsp.h | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff) | |
| parent | 4da3782151300237db3abe070f716922889252e0 (diff) | |
| download | talos-op-linux-14b6848bc0134b8838d374c423df3edda9b1490e.tar.gz talos-op-linux-14b6848bc0134b8838d374c423df3edda9b1490e.zip | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/plat-omap/include/mach/mcbsp.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/mcbsp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index 113c2466c86a..bb154ea76769 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h @@ -344,8 +344,6 @@ struct omap_mcbsp_platform_data { u8 dma_rx_sync, dma_tx_sync; u16 rx_irq, tx_irq; struct omap_mcbsp_ops *ops; - char const **clk_names; - int num_clks; }; struct omap_mcbsp { @@ -377,8 +375,8 @@ struct omap_mcbsp { /* Protect the field .free, while checking if the mcbsp is in use */ spinlock_t lock; struct omap_mcbsp_platform_data *pdata; - struct clk **clks; - int num_clks; + struct clk *iclk; + struct clk *fclk; }; extern struct omap_mcbsp **mcbsp_ptr; extern int omap_mcbsp_count; |
