Changeset 0a9ea4a in mainline for kernel/arch/ia32/include/interrupt.h

Timestamp:

2011-01-14T14:28:57Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1d7a74e, 6336b6e

Parents:

45019865 (diff), 2f60e57d (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 development into lelian/hidd

File:

• kernel/arch/ia32/include/interrupt.h (modified) (1 diff)

kernel/arch/ia32/include/interrupt.h

@@ -55 +55 @@
 #define IRQ_PIC_SPUR  7
 #define IRQ_MOUSE     12
-#define IRQ_DP8390    5
+#define IRQ_NE2000    5
 
 /* This one must have four least significant bits set to ones */