X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_sysfs.c;h=ac8e4c10600d26c0b47d444ec93dc7244ea3a4a2;hp=6655968433cfb47a63d6373b3650b5c8e7a95279;hb=79721e0a7770b1a5874ef96cbf93a4c6bd19e138;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132 diff --git a/udev_sysfs.c b/udev_sysfs.c index 665596843..ac8e4c106 100644 --- a/udev_sysfs.c +++ b/udev_sysfs.c @@ -51,6 +51,8 @@ static const struct subsystem_file { { .subsystem = "ieee1394", .file = NULL }, { .subsystem = "ieee1394_host", .file = NULL }, { .subsystem = "ieee1394_node", .file = NULL }, + { .subsystem = "fc_transport", .file = "port_id" }, + { .subsystem = "fc_host", .file = "port_id" }, { NULL, NULL } }; @@ -170,9 +172,12 @@ static int class_device_expect_no_device_link(struct sysfs_class_device *class_d { .subsystem = "net", .device = "bnep" }, { .subsystem = "net", .device = "vmnet" }, { .subsystem = "net", .device = "ippp" }, + { .subsystem = "net", .device = "nlv" }, + { .subsystem = "net", .device = "atml" }, { .subsystem = "ppp", .device = NULL }, { .subsystem = "sound", .device = NULL }, { .subsystem = "printer", .device = "lp" }, + { .subsystem = "ppdev", .device = NULL }, { .subsystem = "nvidia", .device = NULL }, { .subsystem = "video4linux", .device = "vbi" }, { .subsystem = "dvb", .device = NULL }, @@ -274,6 +279,7 @@ int wait_for_devices_device(struct sysfs_device *devices_dev, { .bus = "ide", .file = "detach_state" }, { .bus = "pci", .file = "vendor" }, { .bus = "platform", .file = "detach_state" }, + { .bus = "pcmcia", .file = "detach_state" }, { .bus = "i2c", .file = "detach_state" }, { .bus = "ieee1394", .file = "node_count" }, { .bus = "ieee1394", .file = "nodeid" },