aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/board-kzm9g.c
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2014-01-22 11:06:54 -0600
committerGary S. Robertson <gary.robertson@linaro.org>2014-01-22 11:06:54 -0600
commita7fd051cd1119af788dd161a4c834b06377d76a8 (patch)
tree80368fccae171d1b0446f3e2b4fd4d9b43e65cbe /arch/arm/mach-shmobile/board-kzm9g.c
parent00629ac158e1be3124b796078cf0347b946cb053 (diff)
parent1071ea6e68ead40df739b223e9013d99c23c19ab (diff)
Merge tag 'v3.10.27' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.27-2014.02
This is the 3.10.27 stable release
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9g.c')
-rw-r--r--arch/arm/mach-shmobile/board-kzm9g.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index e6b775a10aad..4d610e6ea987 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -332,7 +332,7 @@ static struct platform_device lcdc_device = {
.resource = lcdc_resources,
.dev = {
.platform_data = &lcdc_info,
- .coherent_dma_mask = ~0,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
};