Changeset f1d6866 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -405 +405 @@
 static void fun_hw_res_alloc(isa_fun_t *fun)
 {
-        fun->hw_resources.resources = 
+        fun->hw_resources.resources =
             (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
 }