diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /net/bridge | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_sysfs_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index f6a19d53eaeb..2ebdc23bbe26 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c | |||
| @@ -248,7 +248,7 @@ int br_sysfs_addif(struct net_bridge_port *p) | |||
| 248 | if (err) | 248 | if (err) |
| 249 | goto out2; | 249 | goto out2; |
| 250 | 250 | ||
| 251 | kobject_hotplug(&p->kobj, KOBJ_ADD); | 251 | kobject_uevent(&p->kobj, KOBJ_ADD); |
| 252 | return 0; | 252 | return 0; |
| 253 | out2: | 253 | out2: |
| 254 | kobject_del(&p->kobj); | 254 | kobject_del(&p->kobj); |
| @@ -260,7 +260,7 @@ void br_sysfs_removeif(struct net_bridge_port *p) | |||
| 260 | { | 260 | { |
| 261 | pr_debug("br_sysfs_removeif\n"); | 261 | pr_debug("br_sysfs_removeif\n"); |
| 262 | sysfs_remove_link(&p->br->ifobj, p->dev->name); | 262 | sysfs_remove_link(&p->br->ifobj, p->dev->name); |
| 263 | kobject_hotplug(&p->kobj, KOBJ_REMOVE); | 263 | kobject_uevent(&p->kobj, KOBJ_REMOVE); |
| 264 | kobject_del(&p->kobj); | 264 | kobject_del(&p->kobj); |
| 265 | } | 265 | } |
| 266 | 266 | ||