Changeset b0b4592e in mainline for uspace/drv/nic/rtl8139/driver.c


Ignore:
Timestamp:
2014-03-15T19:21:53Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c773adc
Parents:
2034f98 (diff), 8cffdf5 (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/drv/nic/rtl8139/driver.c

    r2034f98 rb0b4592e  
    4141#include <io/log.h>
    4242#include <nic.h>
    43 #include <device/pci.h>
     43#include <pci_dev_iface.h>
    4444
    4545#include <ipc/irc.h>
    … …  
    190190        return;
    191191}
    192 
    193 #include <device/pci.h>
    194192
    195193/** Set PmEn (Power management enable) bit value
Note: See TracChangeset for help on using the changeset viewer.