Changeset f2f4c00 in mainline for uspace/Makefile


Ignore:
Timestamp:
2014-08-03T15:54:44Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8e77b12f
Parents:
251d4dd (diff), 1f1fa64 (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 the rtl8169 driver and improvements to the nic utility from
lp:~nufcia/helenos/rtl8169.

  • Revert the disabling of the ISA devices using IRQ 5.
  • Two minor build fixes for 64-bit platforms.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r251d4dd rf2f4c00  
    154154        drv/nic/ne2k \
    155155        drv/nic/e1k \
    156         drv/nic/rtl8139
     156        drv/nic/rtl8139 \
     157        drv/nic/rtl8169
    157158
    158159## Platform-specific hardware support
Note: See TracChangeset for help on using the changeset viewer.