Merge from stable (which seems to have been spammed at some point in current):

	#ifdef the deltap pcic_set_memory_offset argument so that raylink
driver works.

1 files changed, 5 insertions, 1 deletions

diff --git a/sys/pccard/pcicvar.h b/sys/pccard/pcicvar.h
index bd591e7..185e9a7 100644
--- a/sys/pccard/pcicvar.h
+++ b/sys/pccard/pcicvar.h
@@ -92,7 +92,11 @@ driver_intr_t	pcic_isa_intr;
 int		pcic_isa_intr1(void *);
 void pcic_putb_io(struct pcic_slot *sp, int reg, unsigned char val);
 int pcic_set_memory_offset(device_t bus, device_t child, int rid,
-    u_int32_t offset, u_int32_t *deltap);
+    u_int32_t offset
+#if __FreeBSD_version >= 500000
+    , u_int32_t *deltap
+#endif
+    );
 int pcic_set_res_flags(device_t bus, device_t child, int restype, int rid,
     u_long value);
 void pcic_setb(struct pcic_slot *sp, int reg, unsigned char mask);