summaryrefslogtreecommitdiffstats
path: root/sys/dev/amr/amr.c
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2005-08-08 12:16:21 +0000
committerscottl <scottl@FreeBSD.org>2005-08-08 12:16:21 +0000
commit49e526ab385f4a3b98c51482597b75853bbfcaeb (patch)
treec6505d39c57568871fa01d3663298277128abe95 /sys/dev/amr/amr.c
parent23635726251c53a8c24046d76f2bf60be8d8be56 (diff)
downloadFreeBSD-src-49e526ab385f4a3b98c51482597b75853bbfcaeb.zip
FreeBSD-src-49e526ab385f4a3b98c51482597b75853bbfcaeb.tar.gz
Complete the removal of __FreeBSD_version checks from the amr driver. The
driver had advanced enough over the years that direct sharing of code with FreeBSD 4.x was in no way possible anymore.
Diffstat (limited to 'sys/dev/amr/amr.c')
-rw-r--r--sys/dev/amr/amr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 0f9c4e3..0cf3041 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <dev/amr/amr_compat.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/stat.h>
@@ -929,7 +929,7 @@ amr_bio_command(struct amr_softc *sc, struct amr_command **acp)
ac->ac_bio = bio;
ac->ac_data = bio->bio_data;
ac->ac_length = bio->bio_bcount;
- if (BIO_IS_READ(bio)) {
+ if (bio->bio_cmd == BIO_READ) {
ac->ac_flags |= AMR_CMD_DATAIN;
cmd = AMR_CMD_LREAD;
} else {
OpenPOWER on IntegriCloud