Changeset d5ba17f in mainline for uspace/drv/bus/usb/uhci/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/uhci/main.c

    rb12ca16 rd5ba17f  
    4343#define NAME "uhci"
    4444
    45 static int uhci_add_device(ddf_dev_t *device);
     45static int uhci_dev_add(ddf_dev_t *device);
    4646/*----------------------------------------------------------------------------*/
    4747static driver_ops_t uhci_driver_ops = {
    48         .add_device = uhci_add_device,
     48        .dev_add = uhci_dev_add,
    4949};
    5050/*----------------------------------------------------------------------------*/
     
    5959 * @return Error code.
    6060 */
    61 int uhci_add_device(ddf_dev_t *device)
     61int uhci_dev_add(ddf_dev_t *device)
    6262{
    63         usb_log_debug2("uhci_add_device() called\n");
     63        usb_log_debug2("uhci_dev_add() called\n");
    6464        assert(device);
    6565
Note: See TracChangeset for help on using the changeset viewer.