[PATCH][ALPHA] PCI domains warning

From: Marc Zyngier (mzyngier@freesurf.fr)
Date: Wed Jun 11 2003 - 03:19:34 EST


Ivan,

The included patch fixes a warning about pci_domain_nr being doubly
defined whet CONFIG_PCI_DOMAINS is not set (defined to 0 in
include/linux/pci.h and unconditionnaly defined in
include/asm-alpha/pci.h).

It was preventing a Jensen kernel to be built.

Thanks,

        M.

===== include/asm-alpha/pci.h 1.14 vs edited =====
--- 1.14/include/asm-alpha/pci.h Mon Jun 9 18:25:23 2003
+++ edited/include/asm-alpha/pci.h Wed Jun 11 09:41:37 2003
@@ -192,7 +192,9 @@
 pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
                          struct resource *res);
 
+#ifdef CONFIG_PCI_DOMAINS
 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
+#endif
 
 #endif /* __KERNEL__ */
 

-- 
Places change, faces change. Life is so very strange.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Jun 15 2003 - 22:00:27 EST