X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=f1e0082241e8f611aeb9a637bd54e6cb90f05267;hb=52a6ef66f2e98491b40b176619035abca3777a2c;hp=16a8bffe97b5ab5d629da6a7d1a417a2928e6145;hpb=e41016d3547ef704c0785ba197d36ef69de51260;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 16a8bffe9..f1e008224 100644
--- a/namedev.h
+++ b/namedev.h
@@ -51,11 +51,10 @@ struct sysfs_class_device;
 #define ATTR_PARTITIONS		"all_partitions"
 #define PARTITIONS_COUNT	15
 
-#define PROGRAM_MAXARG		10
 #define MAX_SYSFS_PAIRS		5
 
-#define RULEFILE_EXT		".rules"
-#define PERMFILE_EXT		".permissions"
+#define RULEFILE_SUFFIX		".rules"
+#define PERMFILE_SUFFIX		".permissions"
 
 #define set_empty_perms(dev, m, o, g)		\
 	if (dev->mode == 0)			\
@@ -103,7 +102,7 @@ extern struct list_head config_device_list;
 extern struct list_head perm_device_list;
 
 extern int namedev_init(void);
-extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
+extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern int namedev_init_permissions(void);
 extern int namedev_init_rules(void);