Changeset 30413b31 in mainline for uspace/drv/bus/isa/isa.dev


Ignore:
Timestamp:
2011-12-10T08:29:44Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d9f8dd13
Parents:
b8b1e631 (diff), 87955bfb (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/isa/isa.dev

    rb8b1e631 r30413b31  
    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.