X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev-add.c;h=fedc8f0fc80666d10fe4d6f36a75ba9507f9eac6;hp=9f07d22ec6c95828b015d15b0a968cd8dffb3fa9;hb=ede4308a803131f473efed3dc3246ffac7163dfa;hpb=2e31718495a89e6b582240ed527950f78e7d1849

diff --git a/udev-add.c b/udev-add.c
index 9f07d22ec..fedc8f0fc 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -109,19 +109,12 @@ static int create_node(struct udevice *dev)
 	int retval = 0;
 	uid_t uid = 0;
 	gid_t gid = 0;
-	dev_t res;
 	int i;
 	int tail;
 
 	strncpy(filename, udev_root, sizeof(filename));
 	strncat(filename, dev->name, sizeof(filename));
 
-#ifdef __KLIBC__
-	res = (dev->major << 8) | (dev->minor);
-#else
-	res = makedev(dev->major, dev->minor);
-#endif
-
 	switch (dev->type) {
 	case 'b':
 		dev->mode |= S_IFBLK;
@@ -144,7 +137,7 @@ static int create_node(struct udevice *dev)
 
 	info("creating device node '%s'", filename);
 	dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
-	retval = mknod(filename, dev->mode, res);
+	retval = mknod(filename, dev->mode, makedev(dev->major, dev->minor));
 	if (retval != 0)
 		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
 		    filename, dev->mode, dev->major, dev->minor, strerror(errno));