X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Ftypes%2Ftypes.h;h=3bb8c9be456a6030028bb7569f4b256fa2066a3e;hp=e22dbc307d478389047ad32de52076c57ad955b7;hb=a3e3b66fbcb18174fc54ffd771ef3a38c9f8defd;hpb=366ff957d2900eae6d26ad2f002b735302e7eb41

diff --git a/lib/types/types.h b/lib/types/types.h
index e22dbc3..3bb8c9b 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -113,15 +113,6 @@ struct network_config {
 	unsigned int		n_dns_servers;
 };
 
-struct boot_priority {
-	/* Boot options with higher priority values will take precedence over
-	 * lower values. Negative priorities signify "don't boot this by
-	 * default".
-	 */
-	int			priority;
-	enum device_type	type;
-};
-
 struct autoboot_option {
 	enum {
 		BOOT_DEVICE_TYPE,
@@ -138,10 +129,8 @@ struct config {
 	unsigned int		autoboot_timeout_sec;
 	struct network_config	network;
 
-	struct boot_priority	*boot_priorities;
-	unsigned int		n_boot_priorities;
-
-	char			*boot_device;
+	struct autoboot_option	*autoboot_opts;
+	unsigned int		n_autoboot_opts;
 
 	unsigned int		ipmi_bootdev;
 	bool			ipmi_bootdev_persistent;