Patch merged into coreboot/master: a5a5432 Fix Persimmon build without S3.

the following patch was just integrated into master:
commit a5a543259f455c6d99cf1a8e69cd12cb4bafee20
Author: Marc Jones 
Date:   Tue May 15 16:08:24 2012 -0600

Fix Persimmon build without S3.

In the heap function, only check for S3 check when it is built in
    with CONFIG_HAVE_ACPI_RESUME.

Change-Id: I439275a4e1b7b446b499bcf90c925785a14b980d
    Signed-off-by: Marc Jones

Build-Tested: build bot (Jenkins) at Wed May 16 00:37:02 2012, giving +1
Reviewed-By: Stefan Reinauer  at Thu May 17 20:08:20 2012, giving +2
See http://review.coreboot.org/1034 for details.

-gerrit