2 files changed, 8 insertions, 17 deletions

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index cde18ea82656..54857fa87aaf 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -91,14 +91,14 @@
 
 /* Values for Flag byte above */
 
-#define AOPOBJ_AML_CONSTANT         0x01
-#define AOPOBJ_STATIC_POINTER       0x02
-#define AOPOBJ_DATA_VALID           0x04
-#define AOPOBJ_OBJECT_INITIALIZED   0x08
-#define AOPOBJ_SETUP_COMPLETE       0x10
-#define AOPOBJ_SINGLE_DATUM         0x20
-#define AOPOBJ_INVALID              0x40        /* Used if host OS won't allow an op_region address */
-#define AOPOBJ_MODULE_LEVEL         0x80
+#define AOPOBJ_AML_CONSTANT         0x01        /* Integer is an AML constant */
+#define AOPOBJ_STATIC_POINTER       0x02        /* Data is part of an ACPI table, don't delete */
+#define AOPOBJ_DATA_VALID           0x04        /* Object is intialized and data is valid */
+#define AOPOBJ_OBJECT_INITIALIZED   0x08        /* Region is initialized, _REG was run */
+#define AOPOBJ_SETUP_COMPLETE       0x10        /* Region setup is complete */
+#define AOPOBJ_INVALID              0x20        /* Host OS won't allow a Region address */
+#define AOPOBJ_MODULE_LEVEL         0x40        /* Method is actually module-level code */
+#define AOPOBJ_MODIFIED_NAMESPACE   0x80        /* Method modified the namespace */
 
 /******************************************************************************
  *
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 0686f271c61e..98a331d2249b 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -385,15 +385,6 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
             (field_bit_position -
              ACPI_MUL_8(obj_desc->common_field.base_byte_offset));
 
-        /*
-         * Does the entire field fit within a single field access element? (datum)
-         * (i.e., without crossing a datum boundary)
-         */
-        if ((obj_desc->common_field.start_field_bit_offset +
-             field_bit_length) <= (u16) access_bit_width) {
-                obj_desc->common.flags |= AOPOBJ_SINGLE_DATUM;
-        }
-
         return_ACPI_STATUS(AE_OK);
 }