diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-17 15:14:02 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 15:14:02 -0800 |
commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/plat-omap/sram.c | |
parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
download | linux-stable-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.gz linux-stable-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.bz2 linux-stable-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip |
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/sram.c')
-rw-r--r-- | arch/arm/plat-omap/sram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 93641df487a1..819ea0cfb81a 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -166,7 +166,7 @@ static void __init omap_detect_sram(void) cpu_is_omap1710()) omap_sram_size = 0x4000; /* 16K */ else if (cpu_is_omap1611()) - omap_sram_size = 0x3e800; /* 250K */ + omap_sram_size = SZ_256K; else { printk(KERN_ERR "Could not detect SRAM size\n"); omap_sram_size = 0x4000; |