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 /drivers/usb/host | |
| 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 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/hc_crisv10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c index 0eaabeb37ac3..641268d7e6f3 100644 --- a/drivers/usb/host/hc_crisv10.c +++ b/drivers/usb/host/hc_crisv10.c | |||
| @@ -4397,7 +4397,7 @@ static int __init etrax_usb_hc_init(void) | |||
| 4397 | device_initialize(&fake_device); | 4397 | device_initialize(&fake_device); |
| 4398 | kobject_set_name(&fake_device.kobj, "etrax_usb"); | 4398 | kobject_set_name(&fake_device.kobj, "etrax_usb"); |
| 4399 | kobject_add(&fake_device.kobj); | 4399 | kobject_add(&fake_device.kobj); |
| 4400 | kobject_hotplug(&fake_device.kobj, KOBJ_ADD); | 4400 | kobject_uevent(&fake_device.kobj, KOBJ_ADD); |
| 4401 | hc->bus->controller = &fake_device; | 4401 | hc->bus->controller = &fake_device; |
| 4402 | usb_register_bus(hc->bus); | 4402 | usb_register_bus(hc->bus); |
| 4403 | 4403 | ||