diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/plat-omap/include/mach | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-omap/include/mach')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/mcbsp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index 6eb44a92871d..8fdb95e26fcd 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h | |||
| @@ -315,6 +315,7 @@ struct omap_mcbsp_ops { | |||
| 315 | }; | 315 | }; |
| 316 | 316 | ||
| 317 | struct omap_mcbsp_platform_data { | 317 | struct omap_mcbsp_platform_data { |
| 318 | unsigned long phys_base; | ||
| 318 | u32 virt_base; | 319 | u32 virt_base; |
| 319 | u8 dma_rx_sync, dma_tx_sync; | 320 | u8 dma_rx_sync, dma_tx_sync; |
| 320 | u16 rx_irq, tx_irq; | 321 | u16 rx_irq, tx_irq; |
| @@ -324,6 +325,7 @@ struct omap_mcbsp_platform_data { | |||
| 324 | 325 | ||
| 325 | struct omap_mcbsp { | 326 | struct omap_mcbsp { |
| 326 | struct device *dev; | 327 | struct device *dev; |
| 328 | unsigned long phys_base; | ||
| 327 | u32 io_base; | 329 | u32 io_base; |
| 328 | u8 id; | 330 | u8 id; |
| 329 | u8 free; | 331 | u8 free; |