Changeset f401312 in mainline for kernel/arch/ia32/src/drivers/i8259.c

Timestamp:

2011-01-14T12:34:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

45019865

Parents:

b2a6fcfe (diff), 6610565b (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:

Merged development into lelian/hidd

File:

• kernel/arch/ia32/src/drivers/i8259.c (modified) (1 diff)

kernel/arch/ia32/src/drivers/i8259.c

@@ -86 +86 @@
         disable_irqs_function = pic_disable_irqs;
         eoi_function = pic_eoi;
+        irqs_info = "i8259";
 
         pic_disable_irqs(0xffff);               /* disable all irq's */