summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/acobject.h
diff options
context:
space:
mode:
authorRobert Moore <Robert.Moore@intel.com>2014-03-05 06:12:01 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-18 00:53:45 (GMT)
commit6e596084833b95662dfe90e1f30d83ccbd64575c (patch)
treeca9530e294d057788b551be667f26dbb07b4277e /drivers/acpi/acpica/acobject.h
parentbcef50814c9de8e0672d3e7f9f1abd85e1b95d13 (diff)
downloadlinux-6e596084833b95662dfe90e1f30d83ccbd64575c.tar.xz
ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)."
This reverts commit aae576e5faefa8ba70647efa320d4747b6375f1e. Push and Pop are not portable "enough", and caused problems for some ACPICA customers. Signed-off-by: Robert Moore <Robert.Moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/acobject.h')
-rw-r--r--drivers/acpi/acpica/acobject.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 7ce7e9f..1a4d618 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -44,8 +44,6 @@
#ifndef _ACOBJECT_H
#define _ACOBJECT_H
-#pragma pack(push) /* Set default struct packing */
-
/* acpisrc:struct_defs -- for acpisrc conversion */
/*
@@ -458,6 +456,6 @@ union acpi_descriptor {
union acpi_parse_object op;
};
-#pragma pack(pop) /* Restore original struct packing */
+#pragma pack()
#endif /* _ACOBJECT_H */