Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / drivers / acpi / acpica / utglobal.c

diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 48fffcfe9911547edaba7d016bf01f8baff32f9e..dd3fd7f97f8e2520fffeb17495c879e314845ed0 100644 (file)
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -80,6 +80,11 @@ const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS] = {
        "_S4D"
 };
 
+/* Hex-to-ascii */
+
+const char acpi_gbl_lower_hex_digits[] = "0123456789abcdef";
+const char acpi_gbl_upper_hex_digits[] = "0123456789ABCDEF";
+
 /*******************************************************************************
  *
  * Namespace globals
@@ -221,6 +226,49 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 };
 #endif                         /* !ACPI_REDUCED_HARDWARE */
 
+#if defined (ACPI_DISASSEMBLER) || defined (ACPI_ASL_COMPILER)
+
+/* to_pld macro: compile/disassemble strings */
+
+const char *acpi_gbl_pld_panel_list[] = {
+       "TOP",
+       "BOTTOM",
+       "LEFT",
+       "RIGHT",
+       "FRONT",
+       "BACK",
+       "UNKNOWN",
+       NULL
+};
+
+const char *acpi_gbl_pld_vertical_position_list[] = {
+       "UPPER",
+       "CENTER",
+       "LOWER",
+       NULL
+};
+
+const char *acpi_gbl_pld_horizontal_position_list[] = {
+       "LEFT",
+       "CENTER",
+       "RIGHT",
+       NULL
+};
+
+const char *acpi_gbl_pld_shape_list[] = {
+       "ROUND",
+       "OVAL",
+       "SQUARE",
+       "VERTICALRECTANGLE",
+       "HORIZONTALRECTANGLE",
+       "VERTICALTRAPEZOID",
+       "HORIZONTALTRAPEZOID",
+       "UNKNOWN",
+       "CHAMFERED",
+       NULL
+};
+#endif
+
 /* Public globals */
 
 ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)