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 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/netif/generic/netif_remote.c

    r36a75a2 r59ecd4a  
    3838#include <ipc/services.h>
    3939
    40 #include "../modules.h"
    41 
    42 #include "../structures/measured_strings.h"
    43 #include "../structures/packet/packet.h"
    44 #include "../structures/packet/packet_client.h"
    45 
    46 #include "../include/device.h"
    47 #include "../include/netif_interface.h"
    48 
    49 #include "netif_messages.h"
     40#include <net_modules.h>
     41#include <adt/measured_strings.h>
     42#include <packet/packet.h>
     43#include <packet/packet_client.h>
     44#include <net_device.h>
     45#include <netif_interface.h>
     46#include <netif_messages.h>
    5047
    5148int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data){
Note: See TracChangeset for help on using the changeset viewer.