Patch merged into coreboot/master: tpm/acpi/tpm.asl: Only include tpm.asl if tpm is enabled

the following patch was just integrated into master:
commit f7fd63066fe3b74a1ae10fa6eabf2605d5730449
Author: Martin Roth 
Date:   Thu Mar 3 16:20:53 2016 -0700

tpm/acpi/tpm.asl: Only include tpm.asl if tpm is enabled

If the TPM code isn't getting built in, the Kconfig symbol
    CONFIG_TPM_TIS_BASE_ADDRESS doesn't exist.  This ends up creating
    an invalid operating region in the ACPI tables, causing a bluescreen
    in windows.

This should fix this issue:
    https://ticket.coreboot.org/issues/35
    "commit 85a255fb (acpi/tpm: Gracefully handle missing TPM module)
    breaks Windows"

Change-Id: I32e0e09c1f61551a40f4842168f556d5e1940d28
    Signed-off-by: Martin Roth 
    Reviewed-on: https://review.coreboot.org/13890
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer

See https://review.coreboot.org/13890 for details.

-gerrit