ia64/xen-unstable

changeset 4224:d580210d4a53

bitkeeper revision 1.1236.1.91 (423d4522KOKTF5mJJgjNcM5gwJVm9w)

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
author kaf24@firebug.cl.cam.ac.uk
date Sun Mar 20 09:40:50 2005 +0000 (2005-03-20)
parents 6aa34f9144ae 1a1a16726bd2
children e23288ce8c14
files linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h	Sun Mar 20 08:57:36 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h	Sun Mar 20 09:40:50 2005 +0000
     1.3 @@ -186,7 +186,7 @@ static int xen_floppy_init(void)
     1.4  {
     1.5  	use_virtual_dma = 1;
     1.6  	can_use_virtual_dma = 1;
     1.7 -	return 0x340;
     1.8 +	return 0x3f0;
     1.9  }
    1.10  
    1.11  /*