Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk

ChangeSet 1.1395, 2005/03/30 11:00:28+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
        into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk



 block.h |    1 +
 1 files changed, 1 insertion(+)


diff -Nru a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h 
b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h      2005-03-30 
06:03:52 -05:00
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h      2005-03-30 
06:03:52 -05:00
@@ -46,6 +46,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/io/blkif.h>
+#include <asm-xen/xen-public/io/ring.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>