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

Timestamp:

2011-12-18T14:02:30Z (12 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:

• uspace/drv/nic/lo/lo.c (modified) (2 diffs)

uspace/drv/nic/lo/lo.c

@@ -79 +79 @@
 }
 
-static int lo_add_device(ddf_dev_t *dev)
+static int lo_dev_add(ddf_dev_t *dev)
 {
         nic_t *nic_data = nic_create_and_bind(dev);
@@ -118 +118 @@
 
 static driver_ops_t lo_driver_ops = {
-        .add_device = lo_add_device,
+        .dev_add = lo_dev_add,
 };