Changeset 3819ce5 in mainline for uspace/drv/bus/isa/isa.dev


Ignore:
Timestamp:
2011-12-25T10:05:28Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ecf823a
Parents:
1440eae (diff), 7e1b130 (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

    r1440eae r3819ce5  
    1818        irq 5
    1919        io_range 300 20
     20
     21sb16:
     22        match 100 isa/sb16
     23        io_range 220 20
     24        io_range 330 2
     25        irq 5
     26        dma 1
     27        dma 5
Note: See TracChangeset for help on using the changeset viewer.