summaryrefslogtreecommitdiff
path: root/udev_sysfs.c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-06-21 16:36:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 16:36:29 -0700
commit972d318a3123b00d0ed6b78bbcf70a0965841a8e (patch)
tree8322245ad8e488ad3da9575e2d90b219a99880ea /udev_sysfs.c
parentae8d5e161fe916e39f226ce53f2c5f8b31f582a0 (diff)
parentd27d3bb05288fb5e70bc3f3fc7da1dc8ee5413a8 (diff)
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
Diffstat (limited to 'udev_sysfs.c')
-rw-r--r--udev_sysfs.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/udev_sysfs.c b/udev_sysfs.c
index f9ff1ed2f9..5c43190644 100644
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -297,38 +297,38 @@ int wait_for_devices_device(struct sysfs_device *devices_dev,
{ .bus = "usb", .file = "idVendor" },
{ .bus = "usb", .file = "iInterface" },
{ .bus = "usb", .file = "bNumEndpoints" },
- { .bus = "usb-serial", .file = "detach_state" },
- { .bus = "ide", .file = "detach_state" },
+ { .bus = "usb-serial", .file = "power" },
+ { .bus = "ide", .file = "power" },
{ .bus = "pci", .file = "vendor" },
- { .bus = "platform", .file = "detach_state" },
- { .bus = "pcmcia", .file = "detach_state" },
- { .bus = "i2c", .file = "detach_state" },
+ { .bus = "platform", .file = "power" },
+ { .bus = "pcmcia", .file = "power" },
+ { .bus = "i2c", .file = "power" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "ieee1394", .file = "address" },
{ .bus = "bttv-sub", .file = NULL },
- { .bus = "pnp", .file = "detach_state" },
- { .bus = "eisa", .file = "detach_state" },
- { .bus = "serio", .file = "detach_state" },
- { .bus = "pseudo", .file = "detach_state" },
- { .bus = "mmc", .file = "detach_state" },
- { .bus = "macio", .file = "detach_state" },
- { .bus = "of_platform", .file = "detach_state" },
- { .bus = "vio", .file = "detach_state" },
- { .bus = "ecard", .file = "detach_state" },
- { .bus = "sa1111-rab", .file = "detach_state" },
- { .bus = "amba", .file = "detach_state" },
- { .bus = "locomo-bus", .file = "detach_state" },
- { .bus = "logicmodule", .file = "detach_state" },
- { .bus = "parisc", .file = "detach_state" },
- { .bus = "ocp", .file = "detach_state" },
- { .bus = "dio", .file = "detach_state" },
- { .bus = "MCA", .file = "detach_state" },
- { .bus = "wl", .file = "detach_state" },
- { .bus = "ccwgroup", .file = "detach_state" },
- { .bus = "css", .file = "detach_state" },
- { .bus = "ccw", .file = "detach_state" },
- { .bus = "iucv", .file = "detach_state" },
+ { .bus = "pnp", .file = "power" },
+ { .bus = "eisa", .file = "power" },
+ { .bus = "serio", .file = "power" },
+ { .bus = "pseudo", .file = "power" },
+ { .bus = "mmc", .file = "power" },
+ { .bus = "macio", .file = "power" },
+ { .bus = "of_platform", .file = "power" },
+ { .bus = "vio", .file = "power" },
+ { .bus = "ecard", .file = "power" },
+ { .bus = "sa1111-rab", .file = "power" },
+ { .bus = "amba", .file = "power" },
+ { .bus = "locomo-bus", .file = "power" },
+ { .bus = "logicmodule", .file = "power" },
+ { .bus = "parisc", .file = "power" },
+ { .bus = "ocp", .file = "power" },
+ { .bus = "dio", .file = "power" },
+ { .bus = "MCA", .file = "power" },
+ { .bus = "wl", .file = "power" },
+ { .bus = "ccwgroup", .file = "power" },
+ { .bus = "css", .file = "power" },
+ { .bus = "ccw", .file = "power" },
+ { .bus = "iucv", .file = "power" },
{ NULL, NULL }
};
const struct device_file *devicefile = NULL;