ia64/xen-unstable

changeset 2553:b3e98ee24986

bitkeeper revision 1.1159.1.180 (415454981rxYexOvALFXIf_vDNgdHA)

Merge tempest.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/xeno.bk
author smh22@tempest.cl.cam.ac.uk
date Fri Sep 24 17:08:40 2004 +0000 (2004-09-24)
parents 14dd430a2130 6becc0cc3b8d
children 1fc8bdfed466
files linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c
line diff
     1.1 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile	Fri Sep 24 16:42:56 2004 +0000
     1.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile	Fri Sep 24 17:08:40 2004 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4  
     1.5  O_TARGET := drv.o
     1.6  
     1.7 -subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend
     1.8 -obj-$(CONFIG_XEN_NETDEV_FRONTEND)    += frontend/drv.o
     1.9 +subdir-$(CONFIG_XEN_BLKDEV_FRONTEND) += frontend
    1.10 +obj-$(CONFIG_XEN_BLKDEV_FRONTEND)    += frontend/drv.o
    1.11  
    1.12  subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
    1.13  obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o
     2.1 --- a/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c	Fri Sep 24 16:42:56 2004 +0000
     2.2 +++ b/linux-2.4.27-xen-sparse/drivers/block/ll_rw_blk.c	Fri Sep 24 17:08:40 2004 +0000
     2.3 @@ -1626,7 +1626,7 @@ int __init blk_dev_init(void)
     2.4  	jsfd_init();
     2.5  #endif
     2.6  
     2.7 -#if defined(CONFIG_XEN)
     2.8 +#if defined(CONFIG_XEN_BLKDEV_FRONTEND)
     2.9      xlblk_init();
    2.10  #endif
    2.11