Merge branch 'drm-next-4.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[deliverable/linux.git] / drivers / acpi / nfit.h

diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h
index 46c50148e4b79cf8d05999a3ce651564b805e537..11cb38348aef600cac3215985d98bc7559e37d63 100644 (file)
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@ -52,11 +52,13 @@ enum nfit_uuids {
        NFIT_UUID_MAX,
 };
 
-enum nfit_fic {
-       NFIT_FIC_BYTE = 0x101, /* byte-addressable energy backed */
-       NFIT_FIC_BLK = 0x201, /* block-addressable non-energy backed */
-       NFIT_FIC_BYTEN = 0x301, /* byte-addressable non-energy backed */
-};
+/*
+ * Region format interface codes are stored as an array of bytes in the
+ * NFIT DIMM Control Region structure
+ */
+#define NFIT_FIC_BYTE cpu_to_be16(0x101) /* byte-addressable energy backed */
+#define NFIT_FIC_BLK cpu_to_be16(0x201) /* block-addressable non-energy backed */
+#define NFIT_FIC_BYTEN cpu_to_be16(0x301) /* byte-addressable non-energy backed */
 
 enum {
        NFIT_BLK_READ_FLUSH = 1,