Patch merged into coreboot/master: b393fa0 AGESA S3: Fix ACPISCRATCH in CBMEM

the following patch was just integrated into master:
commit b393fa09e565af929474c442a62589ad1d73acbf
Author: Kyösti Mälkki 
Date:   Sat Jun 21 23:50:53 2014 +0300

AGESA S3: Fix ACPISCRATCH in CBMEM

After commit

2ca2afe ACPI S3 support: Add acpi_s3_resume_allowed()

ACPISCRATCH region in CBMEM was no longer allocated, causing
    AGESA platforms to fail S3 resume.

IS_ENABLED() did not evaluate true here with non-zero parameter.

Also avoid multiple defined defaults for HIGH_SCRATCH_MEMORY_SIZE.

Change-Id: Id99e4bee91581b8ac3d1ec44763b2d792b721832
    Signed-off-by: Kyösti Mälkki 
    Reviewed-on: http://review.coreboot.org/6093
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel 
    Reviewed-by: Edward O'Callaghan 
    Reviewed-by: Martin Roth

See http://review.coreboot.org/6093 for details.

-gerrit