Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / drivers / acpi / acpica / acpredef.h

diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 97116082cb6c58f7fb20c7b1e1523a8864e663de..10998d369ad08d027a6f61e8315597e223dbb561 100644 (file)
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -503,15 +503,16 @@ static const union acpi_predefined_info predefined_names[] =
        {{"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
                          {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */
 
-       {{{0,0,0,0}, 0,0}} /* Table terminator */
-};
+       /* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */
 
-#if 0
-       /* Not implemented */
+       {{"_WDG", 0, ACPI_RTYPE_BUFFER}},
+       {{"_WED", 1,
+         ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER}},
 
-       {{"_WDG", 0, ACPI_RTYPE_BUFFER}},  /* MS Extension */
-       {{"_WED", 1, ACPI_RTYPE_PACKAGE}}, /* MS Extension */
+       {{{0, 0, 0, 0}, 0, 0}}  /* Table terminator */
+};
 
+#if 0
        /* This is an internally implemented control method, no need to check */
        {{"_OSI", 1, ACPI_RTYPE_INTEGER}},