[coreboot-gerrit] Patch set updated for coreboot: e04bff4 arch/x86/include/stdint.h: Don't let header wind up in ASL files

[Edward O'Callaghan (eocallaghan@alterapraxis.com)]

Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8106

-gerrit

commit e04bff461bde32511f74601130bd3c7030f1c786
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Tue Jan 6 04:15:47 2015 +1100

    arch/x86/include/stdint.h: Don't let header wind up in ASL files
    
    Push '#ifndef __ACPI__' guard into system header so that it does
    not wind up in ASL files DSDT builds.
    
    Change-Id: I59800b2f75196ff1c80a29f104ea9fa6706e51fb
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/arch/x86/include/stdint.h     | 5 ++++-
 src/northbridge/intel/gm45/gm45.h | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/include/stdint.h b/src/arch/x86/include/stdint.h
index c491f4b..eed22e0 100644
--- a/src/arch/x86/include/stdint.h
+++ b/src/arch/x86/include/stdint.h
@@ -1,6 +1,8 @@
 #ifndef I386_STDINT_H
 #define I386_STDINT_H
 
+#ifndef __ACPI__
+
 #if defined(__GNUC__)
 #define __HAVE_LONG_LONG__ 1
 #else
@@ -89,7 +91,8 @@ typedef int32_t s32;
 #define PRIu64 "llu"
 #endif
 
-
 #undef __HAVE_LONG_LONG__
 
+#endif /* __ACPI__ */
+
 #endif /* I386_STDINT_H */
diff --git a/src/northbridge/intel/gm45/gm45.h b/src/northbridge/intel/gm45/gm45.h
index 5bdf9e4..0eaa629 100644
--- a/src/northbridge/intel/gm45/gm45.h
+++ b/src/northbridge/intel/gm45/gm45.h
@@ -22,11 +22,10 @@
 #define __NORTHBRIDGE_INTEL_GM45_GM45_H__
 
 #include "southbridge/intel/i82801ix/i82801ix.h"
+#include <stdint.h>
 
 #ifndef __ACPI__
 
-#include <stdint.h>
-
 typedef enum {
 	FSB_CLOCK_1067MHz	= 0,
 	FSB_CLOCK_800MHz	= 1,