diff options
| author | akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk> | 2002-12-06 14:20:10 +0000 |
|---|---|---|
| committer | akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk> | 2002-12-06 14:20:10 +0000 |
| commit | 5a4d8dc794608778815046c0846c0cc23e1c66f3 (patch) | |
| tree | 3af4bc25b353cddae38042556ca46f548d130f63 /xenolinux-2.4.16-sparse/include | |
| parent | 898bb9837e46faf85ee4ff4f6cd0c18379849824 (diff) | |
| parent | ea17a57b54fdd7908919e2322631d400c9bf030d (diff) | |
| download | xen-5a4d8dc794608778815046c0846c0cc23e1c66f3.tar.gz xen-5a4d8dc794608778815046c0846c0cc23e1c66f3.tar.bz2 xen-5a4d8dc794608778815046c0846c0cc23e1c66f3.zip | |
bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)
conflict resolutions
Diffstat (limited to 'xenolinux-2.4.16-sparse/include')
| -rw-r--r-- | xenolinux-2.4.16-sparse/include/asm-xeno/irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xenolinux-2.4.16-sparse/include/asm-xeno/irq.h b/xenolinux-2.4.16-sparse/include/asm-xeno/irq.h index f5f65b8b82..619353e696 100644 --- a/xenolinux-2.4.16-sparse/include/asm-xeno/irq.h +++ b/xenolinux-2.4.16-sparse/include/asm-xeno/irq.h @@ -16,6 +16,8 @@ #define NET_TX_IRQ _EVENT_NET_TX #define NET_RX_IRQ _EVENT_NET_RX +#define NET2_TX_IRQ _EVENT_NET2_TX +#define NET2_RX_IRQ _EVENT_NET2_RX #define TIMER_IRQ _EVENT_TIMER #define NR_IRQS (sizeof(HYPERVISOR_shared_info->events) * 8) |