Changeset 7aaed09 in mainline for uspace/drv/nic/ne2k/ne2k.c


Ignore:
Timestamp:
2011-12-18T14:02:30Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c868e2d
Parents:
3b71e84d (diff), 1761268 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/nic/ne2k/ne2k.c

    r3b71e84d r7aaed09  
    336336}
    337337
    338 static int ne2k_add_device(ddf_dev_t *dev)
     338static int ne2k_dev_add(ddf_dev_t *dev)
    339339{
    340340        /* Allocate driver data for the device. */
    … …  
    391391
    392392static driver_ops_t ne2k_driver_ops = {
    393         .add_device = ne2k_add_device
     393        .dev_add = ne2k_dev_add
    394394};
    395395
Note: See TracChangeset for help on using the changeset viewer.