Auto merge with /home/aegl/GIT/linus

[sfrench/cifs-2.6.git] / include / asm-ia64 / pci.h

diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index f11771eadc48ea95cb6d9f66c721b738cd7f24f3..dba9f220be715b7273f474de70fa1e8338576d44 100644 (file)
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -128,6 +128,7 @@ struct pci_controller {
        void *acpi_handle;
        void *iommu;
        int segment;
+       int node;               /* nearest node with memory or -1 for global allocation */
 
        unsigned int windows;
        struct pci_window *window;