Merge "fix: avoid redefinition of 'efi_guid' structure" into integration

ddbc09ab · Madhukar Pappireddy · TrustedFirmware Code Review · 87311b4c · f34322c1 · ddbc09ab
Commit ddbc09ab authored 3 years ago by Madhukar Pappireddy Committed by TrustedFirmware Code Review 3 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 7 deletions
+0 -7
--- a/plat/arm/css/sgi/sgi_ras.c
+++ b/plat/arm/css/sgi/sgi_ras.c
@@ -20,13 +20,6 @@
 static int sgi_ras_intr_handler(const struct err_record_info *err_rec,
 				int probe_data,
 				const struct err_handler_data *const data);
-struct efi_guid {
-	uint32_t	data1;
-	uint16_t	data2;
-	uint16_t	data3;
-	uint8_t		data4[8];
-};
-
 typedef struct mm_communicate_header {
 	struct efi_guid	header_guid;
 	size_t		message_len;