[PATCH] klibc: version 1.0.4

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 7eb07bf125c375d7eeed2b68cbcd5bf80caa0151..c2706f4593ad36640ef50dea2f5a2f9b46bb92f1 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -48,24 +48,24 @@
 #define DEFAULT_PARTITIONS_COUNT       15
 
 enum device_type {
-       UNKNOWN,
-       CLASS,
-       BLOCK,
-       NET,
-       PHYSDEV,
+       DEV_UNKNOWN,
+       DEV_CLASS,
+       DEV_BLOCK,
+       DEV_NET,
+       DEV_DEVICE,
 };
 
 struct udevice {
        char devpath[PATH_SIZE];
        char subsystem[NAME_SIZE];
 
+       enum device_type type;
        char name[PATH_SIZE];
        char devname[PATH_SIZE];
        struct list_head symlink_list;
        char owner[USER_SIZE];
        char group[USER_SIZE];
        mode_t mode;
-       char type;
        dev_t devt;
 
        char tmp_node[PATH_SIZE];
@@ -92,7 +92,7 @@ extern char udev_root[PATH_SIZE];
 extern char udev_db_path[PATH_SIZE];
 extern char udev_config_filename[PATH_SIZE];
 extern char udev_rules_filename[PATH_SIZE];
-extern int udev_log;
+extern int udev_log_priority;
 extern int udev_dev_d;
 extern int udev_hotplug_d;