7 files changed, 16 insertions, 9 deletions
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
index 6f94b45004..2cf17a7f69 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
@@ -14,7 +14,8 @@
  */
 
 /*
-DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
+#include <arch/acpi.h>
+DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
 		)
 	{
 		#include "routing.asl"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
index 6e9c701a26..a209909b32 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
@@ -15,7 +15,8 @@
 
 /* simple name description */
 /*
-DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
+#include <arch/acpi.h>
+DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
 		)
 	{
 		#include "usb.asl"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
index b5d60d4a92..1b66682b73 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
@@ -14,12 +14,13 @@
  */
 
 /* DefinitionBlock Statement */
+#include <arch/acpi.h>
 DefinitionBlock (
 	"DSDT.AML",	/* Output filename */
 	"DSDT",		/* Signature */
 	0x02,		/* DSDT Revision, needs to be 2 for 64bit */
-	"JETWAY",	/* OEMID */
-	"COREBOOT",	/* TABLE ID */
+	OEM_ID,
+	ACPI_TABLE_CREATOR,
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */
diff --git a/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl b/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl
index 1356379d44..206dd686f5 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl
@@ -19,7 +19,8 @@
  * characteristics.
 */
 /*
-DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001)
+#include <arch/acpi.h>
+DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
 	{
 		Scope (\_PR) {
 		Processor(CPU0,0,0x808,0x06) {
diff --git a/src/mainboard/jetway/pa78vm5/acpi/routing.asl b/src/mainboard/jetway/pa78vm5/acpi/routing.asl
index ab168ce4fc..abb8ddc6bf 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/routing.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/routing.asl
@@ -14,7 +14,8 @@
  */
 
 /*
-DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
+#include <arch/acpi.h>
+DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
 		)
 	{
 		#include "routing.asl"
diff --git a/src/mainboard/jetway/pa78vm5/acpi/usb.asl b/src/mainboard/jetway/pa78vm5/acpi/usb.asl
index d4fc433beb..a3ccb97ff9 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/usb.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/usb.asl
@@ -15,7 +15,8 @@
 
 /* simple name description */
 /*
-DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
+#include <arch/acpi.h>
+DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
 		)
 	{
 		#include "usb.asl"
diff --git a/src/mainboard/jetway/pa78vm5/dsdt.asl b/src/mainboard/jetway/pa78vm5/dsdt.asl
index 1b9d31c44d..4da6035532 100644
--- a/src/mainboard/jetway/pa78vm5/dsdt.asl
+++ b/src/mainboard/jetway/pa78vm5/dsdt.asl
@@ -14,12 +14,13 @@
  */
 
 /* DefinitionBlock Statement */
+#include <arch/acpi.h>
 DefinitionBlock (
 	"DSDT.AML",           /* Output filename */
 	"DSDT",                 /* Signature */
 	0x02,		/* DSDT Revision, needs to be 2 for 64bit */
-	"JETWAY",               /* OEMID */
-	"COREBOOT",	     /* TABLE ID */
+	OEM_ID,
+	ACPI_TABLE_CREATOR,
 	0x00010001	/* OEM Revision */
 	)
 {	/* Start of ASL file */