aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>2004-11-12 18:02:51 +0000
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>2004-11-12 18:02:51 +0000
commit0759afe76d3265cc7a8e34373c8bd94096bc856b (patch)
tree1bbe2eb1f59209a46cfcbe6fc336d14960a85ee8
parentc35cd837f62e8ff4f951327aa6cf2de6f2c78255 (diff)
parent379404498902f3110e7b8b1715c8353c690dc0ee (diff)
downloadxen-0759afe76d3265cc7a8e34373c8bd94096bc856b.tar.gz
xen-0759afe76d3265cc7a8e34373c8bd94096bc856b.tar.bz2
xen-0759afe76d3265cc7a8e34373c8bd94096bc856b.zip
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
-rw-r--r--xen/include/asm-x86/hardirq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h
index f45c3ac654..811415e98a 100644
--- a/xen/include/asm-x86/hardirq.h
+++ b/xen/include/asm-x86/hardirq.h
@@ -2,7 +2,7 @@
#define __ASM_HARDIRQ_H
#include <xen/config.h>
-#include <xen/irq.h>
+#include <xen/cache.h>
/* assembly code in softirq.h is sensitive to the offsets of these fields */
typedef struct {