Changeset db96017 in mainline for uspace/lib/drv/include/remote_nic.h


Ignore:
Timestamp:
2012-04-07T17:41:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b6913b7
Parents:
b69e4c0 (diff), 6bb169b5 (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/drv/include/remote_nic.h

    rb69e4c0 rdb96017  
    11/*
    2  * Copyright (c) 2006 Jakub Vana
     2 * Copyright (c) 2011 Radim Vansa
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup ia32
     29/** @addtogroup libdrv
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef KERN_ia32_VESA_H_
    36 #define KERN_ia32_VESA_H_
     35#ifndef LIBDRV_REMOTE_NIC_H_
     36#define LIBDRV_REMOTE_NIC_H_
    3737
    38 #include <typedefs.h>
    39 
    40 extern bool vesa_init(void);
     38extern remote_iface_t remote_nic_iface;
    4139
    4240#endif
    4341
    44 /** @}
     42/**
     43 * @}
    4544 */
Note: See TracChangeset for help on using the changeset viewer.