diff options
| author | imp <imp@FreeBSD.org> | 2001-04-21 14:10:32 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-04-21 14:10:32 +0000 |
| commit | 13e20daa1e86a85cd9da421607d102ae9e43c896 (patch) | |
| tree | 47b15b7d1d3feef8859d8dee184e573b32fd0a43 /sys/pccard/pccard_nbk.c | |
| parent | d2b6267ec030fc4e50555e76212ad62a6ef7b160 (diff) | |
| download | FreeBSD-src-13e20daa1e86a85cd9da421607d102ae9e43c896.zip FreeBSD-src-13e20daa1e86a85cd9da421607d102ae9e43c896.tar.gz | |
My fix to NEWCARD for getting the function type broke oldcard due to
a name conflict.
Pointed out by: markm
# I had to login to freefall to make this commit, so something maybe up
Diffstat (limited to 'sys/pccard/pccard_nbk.c')
| -rw-r--r-- | sys/pccard/pccard_nbk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c index 5e5d618..62a7267 100644 --- a/sys/pccard/pccard_nbk.c +++ b/sys/pccard/pccard_nbk.c @@ -319,7 +319,7 @@ pccard_get_memory_offset(device_t bus, device_t child, int rid, } static int -pccard_get_function(device_t bus, device_t child, int *function) +pccard_get_function_num(device_t bus, device_t child, int *function) { *function = 0; return (0); @@ -373,7 +373,7 @@ static device_method_t pccard_methods[] = { DEVMETHOD(card_get_res_flags, pccard_get_res_flags), DEVMETHOD(card_set_memory_offset, pccard_set_memory_offset), DEVMETHOD(card_get_memory_offset, pccard_get_memory_offset), - DEVMETHOD(card_get_function, pccard_get_function), + DEVMETHOD(card_get_function, pccard_get_function_num), DEVMETHOD(card_activate_function, pccard_activate_function), DEVMETHOD(card_deactivate_function, pccard_deactivate_function), DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe), |
