Changeset d5ba17f in mainline for uspace/drv/bus/usb/ohci/main.c


Ignore:
Timestamp:
2011-11-18T15:32:24Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
528e5b3
Parents:
b12ca16 (diff), 0c0f823b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ohci/main.c

    rb12ca16 rd5ba17f  
    4848 * @return Error code.
    4949 */
    50 static int ohci_add_device(ddf_dev_t *device)
     50static int ohci_dev_add(ddf_dev_t *device)
    5151{
    52         usb_log_debug("ohci_add_device() called\n");
     52        usb_log_debug("ohci_dev_add() called\n");
    5353        assert(device);
    5454
     
    6565/*----------------------------------------------------------------------------*/
    6666static driver_ops_t ohci_driver_ops = {
    67         .add_device = ohci_add_device,
     67        .dev_add = ohci_dev_add,
    6868};
    6969/*----------------------------------------------------------------------------*/
Note: See TracChangeset for help on using the changeset viewer.