aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap4panda.c
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2011-09-12 21:49:57 -0700
committerIliyan Malchev <malchev@google.com>2011-09-12 21:49:57 -0700
commit31856438b14a00ff51bce959c63263754ba61963 (patch)
treeb09f5d89becb6012677a326e5bc29e13e32ca3e2 /arch/arm/mach-omap2/board-omap4panda.c
parent5207cb909d5277313535adacb95c790b81fc1248 (diff)
parentc892d86c29ca74745c5edcda0a332f863f37375e (diff)
downloadkernel_samsung_tuna-31856438b14a00ff51bce959c63263754ba61963.zip
kernel_samsung_tuna-31856438b14a00ff51bce959c63263754ba61963.tar.gz
kernel_samsung_tuna-31856438b14a00ff51bce959c63263754ba61963.tar.bz2
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 51656d5..4fcd26a 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -64,7 +64,7 @@
#define PHYS_ADDR_SMC_SIZE (SZ_1M * 3)
#define PHYS_ADDR_SMC_MEM (0x80000000 + SZ_1G - PHYS_ADDR_SMC_SIZE)
-#define OMAP_ION_HEAP_SECURE_INPUT_SIZE (SZ_1M * 30)
+#define OMAP_ION_HEAP_SECURE_INPUT_SIZE (SZ_1M * 90)
#define PHYS_ADDR_DUCATI_SIZE (SZ_1M * 105)
#define PHYS_ADDR_DUCATI_MEM (PHYS_ADDR_SMC_MEM - PHYS_ADDR_DUCATI_SIZE - \
OMAP_ION_HEAP_SECURE_INPUT_SIZE)