ia64/xen-unstable

changeset 2960:a337870b8d18

bitkeeper revision 1.1159.170.14 (4194facbchglsPKuuZP2xARQ1tSJxQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-ddb
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xen.bk-ddb
author cl349@freefall.cl.cam.ac.uk
date Fri Nov 12 18:02:51 2004 +0000 (2004-11-12)
parents 5f89e32f3e9d 9496b19804ae
children 36472cdf9921
files xen/include/asm-x86/hardirq.h
line diff
     1.1 --- a/xen/include/asm-x86/hardirq.h	Fri Nov 12 17:21:13 2004 +0000
     1.2 +++ b/xen/include/asm-x86/hardirq.h	Fri Nov 12 18:02:51 2004 +0000
     1.3 @@ -2,7 +2,7 @@
     1.4  #define __ASM_HARDIRQ_H
     1.5  
     1.6  #include <xen/config.h>
     1.7 -#include <xen/irq.h>
     1.8 +#include <xen/cache.h>
     1.9  
    1.10  /* assembly code in softirq.h is sensitive to the offsets of these fields */
    1.11  typedef struct {