diff options
| author | bde <bde@FreeBSD.org> | 1997-03-23 04:40:00 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-03-23 04:40:00 +0000 |
| commit | d12a47b40b3e8d17f0fc52d557d1e8974cf57d00 (patch) | |
| tree | 386aa84a2adecea30287fc4af2f8b3e7403f6426 /sys/scsi | |
| parent | 3676c95c1e887bccd9a3064068e7f428325258bc (diff) | |
| download | FreeBSD-src-d12a47b40b3e8d17f0fc52d557d1e8974cf57d00.zip FreeBSD-src-d12a47b40b3e8d17f0fc52d557d1e8974cf57d00.tar.gz | |
Removed nested #include of <sys/conf.h> from <scsi/scsi_driver.h>
and fixed everything that depended on getting it from the wrong
place. Most of the broken things actually only depended on getting
the declaration of their interrupt handler from "ioconf.h".
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/ch.c | 3 | ||||
| -rw-r--r-- | sys/scsi/scsi_driver.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 9a0ac19..87788c3 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ch.c,v 1.36 1997/02/22 09:44:25 peter Exp $ + * $Id: ch.c,v 1.37 1997/03/06 15:36:14 joerg Exp $ */ #include "opt_scsi.h" @@ -45,6 +45,7 @@ #include <sys/buf.h> #include <sys/proc.h> #include <sys/chio.h> +#include <sys/conf.h> #include <sys/kernel.h> #include <sys/malloc.h> #ifdef DEVFS diff --git a/sys/scsi/scsi_driver.h b/sys/scsi/scsi_driver.h index 652661f..f6875da 100644 --- a/sys/scsi/scsi_driver.h +++ b/sys/scsi/scsi_driver.h @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: scsi_driver.h,v 1.10 1997/02/22 09:44:31 peter Exp $ * */ #ifndef _SCSI__DRIVER_H_ @@ -43,8 +43,6 @@ #ifdef KERNEL -#include <sys/conf.h> - struct scsi_link; struct scsi_device; struct buf; |
