[flashrom-gerrit] Change in flashrom[stable]: Move ich_layout from layout.h to ich_descriptors.h

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21820

Change subject: Move ich_layout from layout.h to ich_descriptors.h
......................................................................

Move ich_layout from layout.h to ich_descriptors.h

This moves the ich_layout declaration from one header to another. This
will avoid a circular dependency when we update the entries[] member in
the follow-up patch to use MAX_NUM_FLREGS which is defined in
ich_descriptors.h.

Original-Change-Id: I08006f1f7c9ccdd17a9a6d74881ed2c8541d4de1
Original-Reviewed-on: https://review.coreboot.org/21337
Original-Tested-by: build bot (Jenkins) 
Original-Reviewed-by: Nico Huber

Change-Id: Ibcdf8ad694e88ffb14f70bb830ebd2a13d6cced8
Signed-off-by: David Hendricks 
---
M ich_descriptors.h
M layout.h
2 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/21820/1

diff --git a/ich_descriptors.h b/ich_descriptors.h
index 4ddc710..9a16031 100644
--- a/ich_descriptors.h
+++ b/ich_descriptors.h
@@ -566,6 +566,11 @@
    struct ich_desc_upper_map upper;
 };

+struct ich_layout {
+	struct flashrom_layout base;
+	struct romentry entries[5];
+};
+
 ssize_t ich_number_of_regions(enum ich_chipset cs, const struct ich_desc_content *content);
 ssize_t ich_number_of_masters(enum ich_chipset cs, const struct ich_desc_content *content);

diff --git a/layout.h b/layout.h
index c93d754..f32dc82 100644
--- a/layout.h
+++ b/layout.h
@@ -57,11 +57,6 @@
    struct romentry entry;
 };

-struct ich_layout {
-	struct flashrom_layout base;
-	struct romentry entries[5];
-};
-
 struct flashrom_layout *get_global_layout(void);

int process_include_args(struct flashrom_layout *);