Changeset 59ecd4a in mainline for uspace/srv/net/il/arp/arp.h


Ignore:
Timestamp:
2010-04-04T21:41:47Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5db9084
Parents:
36a75a2 (diff), ee7e82a9 (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/net/il/arp/arp.h

    r36a75a2 r59ecd4a  
    4343#include <ipc/services.h>
    4444
    45 #include "../../include/device.h"
    46 #include "../../include/hardware.h"
    47 
    48 #include "../../structures/generic_char_map.h"
    49 #include "../../structures/int_map.h"
    50 #include "../../structures/measured_strings.h"
     45#include <net_device.h>
     46#include <net_hardware.h>
     47#include <adt/generic_char_map.h>
     48#include <adt/int_map.h>
     49#include <adt/measured_strings.h>
    5150
    5251
Note: See TracChangeset for help on using the changeset viewer.