Changeset 899f1a9 in mainline for uspace/drv/bus


Ignore:
Timestamp:
2011-12-11T20:27:56Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c24c157d
Parents:
4c67e52 (diff), 9c3bba0 (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/bus/isa/isa.dev

    r4c67e52 r899f1a9  
    1313        irq 1
    1414        io_range 060 10
    15        
     15
     16ne2k:
     17        match 100 isa/ne2k
     18        irq 5
     19        io_range 300 20
Note: See TracChangeset for help on using the changeset viewer.