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


Ignore:
Timestamp:
2011-11-18T15:32:24Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
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/ehci/main.c

    rb12ca16 rd5ba17f  
    4646#include "ehci.h"
    4747
    48 static int ehci_add_device(ddf_dev_t *device);
     48static int ehci_dev_add(ddf_dev_t *device);
    4949/*----------------------------------------------------------------------------*/
    5050static driver_ops_t ehci_driver_ops = {
    51         .add_device = ehci_add_device,
     51        .dev_add = ehci_dev_add,
    5252};
    5353/*----------------------------------------------------------------------------*/
     
    6666 * @return Error code.
    6767 */
    68 static int ehci_add_device(ddf_dev_t *device)
     68static int ehci_dev_add(ddf_dev_t *device)
    6969{
    7070        assert(device);
Note: See TracChangeset for help on using the changeset viewer.