From 891619a66d5e01e5d5db6a11cfd7f26c815338e3 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue, 1 Apr 2003 15:06:26 +0000
Subject: Use bioq_flush() to drain a bio queue with a specific error code.
 Retain the mistake of not updating the devstat API for now.

Spell bioq_disksort() consistently with the remaining bioq_*().

#include <geom/geom_disk.h> where this is more appropriate.
---
 sys/dev/mlx/mlx.c      | 3 ++-
 sys/dev/mlx/mlx_disk.c | 3 ++-
 sys/dev/mlx/mlx_pci.c  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'sys/dev/mlx')

diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index d8841de676ca..b68dd71be133 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -37,7 +37,6 @@
 
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/disk.h>
 #include <sys/stat.h>
 
 #include <machine/resource.h>
@@ -47,6 +46,8 @@
 #include <machine/clock.h>
 #include <sys/rman.h>
 
+#include <geom/geom_disk.h>
+
 #include <dev/mlx/mlx_compat.h>
 #include <dev/mlx/mlxio.h>
 #include <dev/mlx/mlxvar.h>
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 0b8664fdee9c..44c596531b77 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -37,11 +37,12 @@
 
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/disk.h>
 
 #include <machine/bus.h>
 #include <sys/rman.h>
 
+#include <geom/geom_disk.h>
+
 #include <dev/mlx/mlx_compat.h>
 #include <dev/mlx/mlxio.h>
 #include <dev/mlx/mlxvar.h>
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index 4a2124698805..a2c179268fa3 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -32,7 +32,6 @@
 
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/disk.h>
 
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
@@ -40,6 +39,8 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
+#include <geom/geom_disk.h>
+
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
-- 
cgit v1.3