diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:22 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:46:22 +0800 |
| commit | 1c4a401e4961ffda3c432504e69d12316cfdbdf3 (patch) | |
| tree | 1fa2157f1d2712a7f838eadd236e35681957c323 /drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h | |
| parent | c65e9ef43160d318d715d5a1c8752864aace85f0 (diff) | |
| parent | fcddfa7f1d6cbdd5b841665b2337422627394cff (diff) | |
Merge topic branch 'mali-android' into integration-android-ux500
Diffstat (limited to 'drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h')
| -rw-r--r-- | drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h index cc1f05cb5f4..ec4570686d8 100644 --- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h @@ -35,8 +35,7 @@ static _mali_osk_resource_t arch_configuration [] = .irq = -1, .description = "Mali-400 PP 1", .mmu_id = 3 -}, -#if USING_MMU + }, { .type = MMU, .base = 0xC0003000, @@ -58,7 +57,6 @@ static _mali_osk_resource_t arch_configuration [] = .description = "Mali-400 MMU for PP 1", .mmu_id = 3 }, -#endif { .type = MEMORY, .description = "Mali SDRAM remapped to baseboard", |