Ignore:
Timestamp:
2010-10-19T20:55:53Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a93d79a
Parents:
1882525 (diff), a7a85d16 (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/srv/hw/netif/dp8390/dp8390_module.c

    r1882525 rf14291b  
    3939#include <ddi.h>
    4040#include <errno.h>
     41#include <err.h>
    4142#include <malloc.h>
    4243#include <ipc/ipc.h>
    4344#include <ipc/services.h>
    4445
    45 #include <net_err.h>
    46 #include <net_messages.h>
    47 #include <net_modules.h>
    48 #include <packet/packet_client.h>
     46#include <net/modules.h>
     47#include <packet_client.h>
    4948#include <adt/measured_strings.h>
    50 #include <net_device.h>
     49#include <net/device.h>
    5150#include <nil_interface.h>
    5251#include <netif_interface.h>
Note: See TracChangeset for help on using the changeset viewer.