Changeset 7aaed09 in mainline for uspace/drv/bus/isa/isa.dev

Timestamp:

2011-12-18T14:02:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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:

• uspace/drv/bus/isa/isa.dev (modified) (1 diff)

uspace/drv/bus/isa/isa.dev

@@ -13 +13 @@
         irq 1
         io_range 060 10
-        
+
+ne2k:
+        match 100 isa/ne2k
+        irq 5
+        io_range 300 20