From d56ddb5579b8333b3adf13c753b93e65b099db24 Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 23 Jan 2001 22:06:10 +0000 Subject: The ncv_card_intr function is only used in older versions of FreeBSD, so move its prototype and definition inside the appropriate #ifdef's. --- sys/dev/ncv/ncr53c500_pccard.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sys/dev/ncv') diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index 0ba9894..a7ac712 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -91,10 +91,10 @@ extern struct ncv_softc *ncvdata[]; static int ncvprobe(DEVPORT_PDEVICE devi); static int ncvattach(DEVPORT_PDEVICE devi); -static int ncv_card_intr __P((DEVPORT_PDEVICE)); static void ncv_card_unload __P((DEVPORT_PDEVICE)); #if defined(__FreeBSD__) && __FreeBSD_version < 400001 static int ncv_card_init __P((DEVPORT_PDEVICE)); +static int ncv_card_intr __P((DEVPORT_PDEVICE)); #endif #if defined(__FreeBSD__) && __FreeBSD_version >= 400001 @@ -303,6 +303,14 @@ ncv_card_init(DEVPORT_PDEVICE devi) return (ENXIO); return (0); } + +static int +ncv_card_intr(DEVPORT_PDEVICE devi) +{ + + ncvintr(DEVPORT_PDEVGET_SOFTC(devi)); + return 1; +} #endif static void @@ -316,14 +324,6 @@ ncv_card_unload(DEVPORT_PDEVICE devi) } static int -ncv_card_intr(DEVPORT_PDEVICE devi) -{ - - ncvintr(DEVPORT_PDEVGET_SOFTC(devi)); - return 1; -} - -static int ncvprobe(DEVPORT_PDEVICE devi) { int rv; -- cgit v1.1