X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flibvolume_id%2Fnvidia_raid.c;h=10c1c714f7a477a0c599a9428eaeaeb9ae77ad90;hb=b5e694267142042228a6cac99ecad6c4b4ef8759;hp=3b967e6979c51db749aba3aaf853d5622619ad9e;hpb=f054627f500450a7aadeaf8a9930354fb268718e;p=elogind.git

diff --git a/extras/volume_id/libvolume_id/nvidia_raid.c b/extras/volume_id/libvolume_id/nvidia_raid.c
index 3b967e697..10c1c714f 100644
--- a/extras/volume_id/libvolume_id/nvidia_raid.c
+++ b/extras/volume_id/libvolume_id/nvidia_raid.c
@@ -23,8 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "volume_id.h"
-#include "logging.h"
+#include "libvolume_id.h"
 #include "util.h"
 
 struct nvidia_meta {
@@ -32,7 +31,7 @@ struct nvidia_meta {
 	uint32_t	size;
 	uint32_t	chksum;
 	uint16_t	version;
-} __attribute__((packed));
+} PACKED;
 
 #define NVIDIA_SIGNATURE		"NVIDIA"