diff options
| author | imp <imp@FreeBSD.org> | 2001-08-14 23:34:09 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-08-14 23:34:09 +0000 |
| commit | f4b75f5bb2788c0eb99520c41162bef37f41dd58 (patch) | |
| tree | 3c43f20b69829885ad6dcce303db7924efec9307 /sys/pccard/pcic.c | |
| parent | 09db468bbb936df7a97e76ccd18eb85f0d3f6212 (diff) | |
| download | FreeBSD-src-f4b75f5bb2788c0eb99520c41162bef37f41dd58.zip FreeBSD-src-f4b75f5bb2788c0eb99520c41162bef37f41dd58.tar.gz | |
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.
Diffstat (limited to 'sys/pccard/pcic.c')
| -rw-r--r-- | sys/pccard/pcic.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c index f4ba817..6208bd7 100644 --- a/sys/pccard/pcic.c +++ b/sys/pccard/pcic.c @@ -887,15 +887,20 @@ pcic_get_res_flags(device_t bus, device_t child, int restype, int rid, } int -pcic_set_memory_offset(device_t bus, device_t child, int rid, u_int32_t offset, - u_int32_t *deltap) +pcic_set_memory_offset(device_t bus, device_t child, int rid, u_int32_t offset +#if __FreeBSD_version >= 500000 + ,u_int32_t *deltap +#endif + ) { struct pccard_devinfo *devi = device_get_ivars(child); struct mem_desc *mp = &devi->slt->mem[rid]; mp->card = offset; +#if __FreeBSD_version >= 500000 if (deltap) *deltap = 0; /* XXX BAD XXX */ +#endif return (pcic_memory(devi->slt, rid)); } |
