diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:44:14 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:44:14 +0200 |
| commit | 70526554173aa46c8b13a59992b6fbc555fd4ee0 (patch) | |
| tree | 21f0af1030935e2841b1427861905fef216e149f /drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-pb-virtex5-m400-2/config.h | |
| parent | 2ee8379b83e5afb57dd19192109380736c1c4431 (diff) | |
| parent | a613e39784b04863a3e885be0b21b5966b7ff174 (diff) | |
Merge branch 'mali-android' into stable-android-ux500-3.3-1
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", |