diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:37:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:37:28 +0200 |
commit | 09b22a2f678ae733801b888c44756d0abd686b8a (patch) | |
tree | 6ca52d4011ce6b11c6450d3a574ea6a53cc0d339 /arch/arm/plat-omap/include | |
parent | 3ba35573ad9a149a3af19625b502679283382f6b (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | kernel_samsung_tuna-09b22a2f678ae733801b888c44756d0abd686b8a.zip kernel_samsung_tuna-09b22a2f678ae733801b888c44756d0abd686b8a.tar.gz kernel_samsung_tuna-09b22a2f678ae733801b888c44756d0abd686b8a.tar.bz2 |
Merge commit 'v2.6.27-rc6' into sched/devel
Diffstat (limited to 'arch/arm/plat-omap/include')
-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 6eb44a9..8fdb95e 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 { }; struct omap_mcbsp_platform_data { + unsigned long phys_base; u32 virt_base; u8 dma_rx_sync, dma_tx_sync; u16 rx_irq, tx_irq; @@ -324,6 +325,7 @@ struct omap_mcbsp_platform_data { struct omap_mcbsp { struct device *dev; + unsigned long phys_base; u32 io_base; u8 id; u8 free; |