Patch merged into coreboot/master: 70a6b4f arch/x86: Guard option table specific rules with HAVE_OPTION_TABLE

the following patch was just integrated into master:
commit 70a6b4f9314e9f5cd55550e631ccbc28318299c4
Author: Patrick Georgi 
Date:   Fri Mar 27 14:14:58 2015 +0100

arch/x86: Guard option table specific rules with HAVE_OPTION_TABLE

This is inspired by the commit listed below, but rewritten to match
    upstream, and split in smaller pieces to keep intent clear.

Change-Id: Ia22c9fcbf8c629d0eb3f1356f80c4565f117d8b8
    Signed-off-by: Patrick Georgi 
    Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b
    Based-On-Signed-off-by: Julius Werner 
    Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170
    Reviewed-on: http://review.coreboot.org/9110
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer

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

-gerrit