From: Martin Mares <mj@ucw.cz>
Date: Sat, 14 May 2016 09:48:32 +0000 (+0200)
Subject: Merge branch 'domains'
X-Git-Tag: v3.5.0~6
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8442ab4bc6a775a5fea8132c133e49f9b9bf71d5;p=pciutils.git

Merge branch 'domains'

Conflicts:
	lib/pci.h
---

8442ab4bc6a775a5fea8132c133e49f9b9bf71d5
diff --cc lib/pci.h
index 6d904dd,545cefe..47610f3
--- a/lib/pci.h
+++ b/lib/pci.h
@@@ -136,8 -136,7 +136,9 @@@ struct pci_dev 
    char *module_alias;			/* Linux kernel module alias */
    char *label;				/* Device name as exported by BIOS */
    int numa_node;			/* NUMA node */
 +  pciaddr_t flags[6];			/* PCI_IORESOURCE_* flags for regions */
 +  pciaddr_t rom_flags;			/* PCI_IORESOURCE_* flags for expansion ROM */
+   int domain;				/* 32-bit PCI domain (host bridge) */
  
    /* Fields used internally: */
    struct pci_access *access;