aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>2005-04-19 16:14:28 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>2005-04-19 16:14:28 -0400
commit9f6c6fc505560465be0964eb4da1b6ca97bd3951 (patch)
tree9660991b5e417ad7bb74e105c037ff358f60ba27 /drivers/usb/host
parentc3c661932cd53582c5b03692b99649300977248a (diff)
parentf0e035f4b6940aae6836500b642029c289ed4535 (diff)
Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
for 13 driver core, sysfs, and debugfs fixes.
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/hc_crisv10.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c
index 4b12be822bd4..376f8a034f65 100644
--- a/drivers/usb/host/hc_crisv10.c
+++ b/drivers/usb/host/hc_crisv10.c
@@ -4396,6 +4396,7 @@ static int __init etrax_usb_hc_init(void)
4396 device_initialize(&fake_device); 4396 device_initialize(&fake_device);
4397 kobject_set_name(&fake_device.kobj, "etrax_usb"); 4397 kobject_set_name(&fake_device.kobj, "etrax_usb");
4398 kobject_add(&fake_device.kobj); 4398 kobject_add(&fake_device.kobj);
4399 kobject_hotplug(&fake_device.kobj, KOBJ_ADD);
4399 hc->bus->controller = &fake_device; 4400 hc->bus->controller = &fake_device;
4400 usb_register_bus(hc->bus); 4401 usb_register_bus(hc->bus);
4401 4402