direct-io.hg

changeset 3269:f21030c169e2

bitkeeper revision 1.1159.183.51 (41bb070aDsGognVnkbq-nQ0qxDpb6w)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Sat Dec 11 14:41:14 2004 +0000 (2004-12-11)
parents c00fbb136368 9a8889149665
children fe0fc756ee20
files xen/common/physdev.c
line diff
     1.1 --- a/xen/common/physdev.c	Sat Dec 11 11:46:25 2004 +0000
     1.2 +++ b/xen/common/physdev.c	Sat Dec 11 14:41:14 2004 +0000
     1.3 @@ -742,7 +742,8 @@ void physdev_init_dom0(struct domain *p)
     1.4           *
     1.5           * In Linux2.6 we set pcibios_scan_all_fns().
     1.6           */
     1.7 -        if ( dev->hdr_type != PCI_HEADER_TYPE_NORMAL )
     1.8 +        if ( (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) &&
     1.9 +             (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) )
    1.10              continue;
    1.11          pdev = xmalloc(sizeof(phys_dev_t));
    1.12          pdev->dev = dev;