diff options
| author | Bo Yan <byan@nvidia.com> | 2012-06-26 18:35:42 -0700 |
|---|---|---|
| committer | Bo Yan <byan@nvidia.com> | 2012-06-26 18:35:42 -0700 |
| commit | 1aceab38b0efa7fc6cc7b6ff57cc5b72a42bd4da (patch) | |
| tree | 714172cb1506b25ef9d0eabc696f105da7da568f /drivers/video/tegra/nvmap | |
| parent | 54ec3041915cf0d81e2857c8c4792e41a52955ca (diff) | |
| parent | 67daf3409c2142242de23de8a8c7e80cb3b6eabc (diff) | |
Merge remote branch 'remotes/vwa/dev/android-t114-3.4-rebased' into new
This actually merges TOT of dev/android-t114-3.4-rebased into
origin/android-t114-3.4 on 6/26/2012
Conflicts:
arch/arm/configs/tegra_curacao_android_defconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-curacao-panel.c
arch/arm/mach-tegra/board-curacao-pinmux.c
arch/arm/mach-tegra/board-curacao-power.c
arch/arm/mach-tegra/board-curacao.c
arch/arm/mach-tegra/board-curacao.h
arch/arm/mach-tegra/include/mach/iomap.h
arch/arm/mach-tegra/include/mach/irqs.h
arch/arm/mach-tegra/tegra11_clocks.c
Change-Id: I37608c30489613150a5e9e270af71c16cc667005
Diffstat (limited to 'drivers/video/tegra/nvmap')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap.h b/drivers/video/tegra/nvmap/nvmap.h index 25403f5e7098..715a39f15267 100644 --- a/drivers/video/tegra/nvmap/nvmap.h +++ b/drivers/video/tegra/nvmap/nvmap.h @@ -193,8 +193,10 @@ static inline pgprot_t nvmap_pgprot(struct nvmap_handle *h, pgprot_t prot) return pgprot_noncached(prot); else if (h->flags == NVMAP_HANDLE_WRITE_COMBINE) return pgprot_writecombine(prot); +#ifndef CONFIG_ARM_LPAE /* !!!FIXME!!! BUG 892578 */ else if (h->flags == NVMAP_HANDLE_INNER_CACHEABLE) return pgprot_inner_writeback(prot); +#endif return prot; } |