X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=3a161441696eeb575c103afc82c75795cffad3af;hb=b821330f0fce374902a1c8e32064196276006bca;hp=1e1a9bbc3450013a7dafe306c3e965b9e637e3f2;hpb=fd9efc00a2e477423185c993b8ec4570ef3ee07d;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 1e1a9bbc3..3a1614416 100644
--- a/namedev.h
+++ b/namedev.h
@@ -36,14 +36,14 @@ struct sysfs_class_device;
 #define DRIVER_SIZE		64
 #define PROGRAM_SIZE		128
 
+#define FIELD_KERNEL		"KERNEL"
+#define FIELD_SUBSYSTEM		"SUBSYSTEM"
 #define FIELD_BUS		"BUS"
 #define FIELD_SYSFS		"SYSFS"
 #define FIELD_ID		"ID"
 #define FIELD_PLACE		"PLACE"
 #define FIELD_PROGRAM		"PROGRAM"
 #define FIELD_RESULT		"RESULT"
-#define FIELD_KERNEL		"KERNEL"
-#define FIELD_SUBSYSTEM		"SUBSYSTEM"
 #define FIELD_DRIVER		"DRIVER"
 #define FIELD_NAME		"NAME"
 #define FIELD_SYMLINK		"SYMLINK"
@@ -68,17 +68,17 @@ struct sysfs_pair {
 struct config_device {
 	struct list_head node;
 
+	char kernel[NAME_SIZE];
+	char subsystem[SUBSYSTEM_SIZE];
 	char bus[BUS_SIZE];
 	char id[ID_SIZE];
 	char place[PLACE_SIZE];
-	char kernel[NAME_SIZE];
+	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
 	char program[PROGRAM_SIZE];
 	char result[PROGRAM_SIZE];
-	char subsystem[SUBSYSTEM_SIZE];
 	char driver[DRIVER_SIZE];
 	char name[NAME_SIZE];
 	char symlink[NAME_SIZE];
-	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
 
 	char owner[USER_SIZE];
 	char group[USER_SIZE];