Changeset 8a9a41e in mainline for uspace/lib/device/include/nic/nic.h


Ignore:
Timestamp:
2021-10-24T08:28:43Z (2 years ago)
Author:
GitHub <noreply@…>
Children:
f628215
Parents:
2ce943a (diff), cd981f2a (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.
git-author:
Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)
git-committer:
GitHub <noreply@…> (2021-10-24 08:28:43)
Message:

Merge branch 'HelenOS:master' into master

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/device/include/nic/nic.h

    r2ce943a r8a9a41e  
    2828 */
    2929
    30 /** @addtogroup libc
     30/** @addtogroup libdevice
    3131 * @{
    3232 */
     
    3636 */
    3737
    38 #ifndef _LIBC_NIC_H_
    39 #define _LIBC_NIC_H_
     38#ifndef LIBDEVICE_NIC_H
     39#define LIBDEVICE_NIC_H
    4040
    4141#include <nic/eth_phys.h>
     
    269269        /** The mask of all modes which the device can advertise
    270270         *
    271          *  see ETH_AUTONEG_ macros in nic/eth_phys.h of libc
     271         *  see ETH_AUTONEG_ macros in nic/eth_phys.h of libdevice
    272272         */
    273273        uint32_t autoneg_support;
Note: See TracChangeset for help on using the changeset viewer.