Sun Sep 16 12:10:57 2012 UTC ()
Be consistent with applying __HAVE_PCI_CONF_HOOK around bcmpax_conf_hook
implementation as well.  Fixes build for BCM5301X evbarm kernel.


(he)
diff -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm53xx_pax.c

cvs diff -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm53xx_pax.c (expand / switch to context diff)
--- src/sys/arch/arm/broadcom/bcm53xx_pax.c 2012/09/14 04:53:58 1.2
+++ src/sys/arch/arm/broadcom/bcm53xx_pax.c 2012/09/16 12:10:57 1.3
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.2 2012/09/14 04:53:58 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.3 2012/09/16 12:10:57 he Exp $");
 
 #include <sys/bus.h>
 #include <sys/device.h>
@@ -367,6 +367,7 @@
 	*ilinep = 5; /* (ipin + swiz) & 3; */
 }
 
+#ifdef __HAVE_PCI_CONF_HOOK
 static int
 bcmpax_conf_hook(void *v, int bus, int dev, int func, pcireg_t id)
 {
@@ -375,6 +376,7 @@
 
 	return PCI_CONF_ENABLE_MEM | PCI_CONF_MAP_MEM;
 }
+#endif
 
 static int
 bcmpax_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *pihp)