summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2011-05-25 03:26:21 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2011-05-25 03:26:21 +0000
commit209640a14f301d72132790d3c4e8140f0a7d5af9 (patch)
tree798d63181700dcb35095a42a560fdae858c66cc0
parent38906e83b50fb054c3a4f8d3cb05c48027812675 (diff)
wdc.c doesn't use NATAPISCSI, so no point in including atapiscsi.h.
It's the last file referencing atapiscsi.h too, so might as well get rid of the need-flags in files.atapiscsi.
-rw-r--r--sys/dev/atapiscsi/files.atapiscsi4
-rw-r--r--sys/dev/ic/wdc.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/atapiscsi/files.atapiscsi b/sys/dev/atapiscsi/files.atapiscsi
index 1af122e4b9a..d01d1f0e946 100644
--- a/sys/dev/atapiscsi/files.atapiscsi
+++ b/sys/dev/atapiscsi/files.atapiscsi
@@ -1,8 +1,8 @@
-# $OpenBSD: files.atapiscsi,v 1.7 2009/06/20 14:35:51 miod Exp $
+# $OpenBSD: files.atapiscsi,v 1.8 2011/05/25 03:26:20 matthew Exp $
# ATAPI transport for SCSI protocol
#
device atapiscsi: scsi, wdc_base
attach atapiscsi at atapi
-file dev/atapiscsi/atapiscsi.c atapiscsi needs-flag
+file dev/atapiscsi/atapiscsi.c atapiscsi
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 288af34f0c8..aaa97885fc5 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.117 2011/05/24 23:18:47 matthew Exp $ */
+/* $OpenBSD: wdc.c,v 1.118 2011/05/25 03:26:20 matthew Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -75,8 +75,6 @@
#include <dev/ic/wdcvar.h>
#include <dev/ic/wdcevent.h>
-#include "atapiscsi.h"
-
#define WDCDELAY 100 /* 100 microseconds */
#define WDCNDELAY_RST (WDC_RESET_WAIT * 1000 / WDCDELAY)
#if 0