From: Geoff Levand <geoff@infradead.org>
Date: Wed, 15 Feb 2012 19:23:55 +0000 (-0800)
Subject: Remove union in pb_opt_data
X-Git-Tag: v1.0.0~792
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=5cceb42c773aa404456417685ea50b2ada5570a2

Remove union in pb_opt_data

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/ui/common/ui-system.h b/ui/common/ui-system.h
index 2dc37a3..ca5edb4 100644
--- a/ui/common/ui-system.h
+++ b/ui/common/ui-system.h
@@ -47,10 +47,8 @@ struct pb_opt_data {
 	struct pb_kexec_data *kd;
 
 	/* optional data */
-	union {
-		const struct device *dev;
-		const struct boot_option *opt;
-	};
+	const struct device *dev;
+	const struct boot_option *opt;
 	uint32_t opt_hash;
 };