diff options
| author | Eric Anholt <eric@anholt.net> | 2010-05-07 17:30:03 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-10 16:36:52 -0400 |
| commit | 34dc4d4423dc342848d72be764832cbc0852854a (patch) | |
| tree | 056402a4afc2b7ef2f4dee30a712ce847279c13a /arch/arm/plat-omap/include/plat/mcbsp.h | |
| parent | 3d8620cc5f8538364ee152811e2bd8713abb1d58 (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge remote branch 'origin/master' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c
The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
Diffstat (limited to 'arch/arm/plat-omap/include/plat/mcbsp.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mcbsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index 39748354ce45..7de903d7c1ce 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #define OMAP44XX_MCBSP1_BASE 0x49022000 | 59 | #define OMAP44XX_MCBSP1_BASE 0x49022000 |
| 60 | #define OMAP44XX_MCBSP2_BASE 0x49024000 | 60 | #define OMAP44XX_MCBSP2_BASE 0x49024000 |
| 61 | #define OMAP44XX_MCBSP3_BASE 0x49026000 | 61 | #define OMAP44XX_MCBSP3_BASE 0x49026000 |
| 62 | #define OMAP44XX_MCBSP4_BASE 0x48074000 | 62 | #define OMAP44XX_MCBSP4_BASE 0x48096000 |
| 63 | 63 | ||
| 64 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) | 64 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) |
| 65 | 65 | ||