summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorse <se@FreeBSD.org>1997-04-28 19:26:18 +0000
committerse <se@FreeBSD.org>1997-04-28 19:26:18 +0000
commit299d0a28fc28064d066cc2f1819d7f5ebb728e58 (patch)
tree4cea8d406cbaf7b72b283ab22a07945bb8b22b64 /sys
parent6af94e8c0a15fdcbe1213ef32c5ec7ffa1f84b6f (diff)
downloadFreeBSD-src-299d0a28fc28064d066cc2f1819d7f5ebb728e58.zip
FreeBSD-src-299d0a28fc28064d066cc2f1819d7f5ebb728e58.tar.gz
Move CMD640 option from kernel Makefile into opt_wd.h
Submitted by: Wolfgang Helbig <helbig@mx.ba-stuttgart.de>
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/options.i3864
-rw-r--r--sys/i386/conf/options.i3864
-rw-r--r--sys/i386/isa/wd.c3
-rw-r--r--sys/pci/wdc_p.c3
4 files changed, 10 insertions, 4 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 161e73d..9b855c1 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.41 1997/04/27 20:01:47 peter Exp $
+# $Id: options.i386,v 1.42 1997/04/28 00:24:28 fsmp Exp $
XXXCreateMe opt_global.h
BOUNCEPAGES opt_bounce.h
@@ -88,6 +88,8 @@ KBDIO_DEBUG opt_kbdio.h
ATAPI opt_atapi.h
ATAPI_STATIC opt_atapi.h
+CMD640 opt_wd.h
+
USERCONFIG opt_userconfig.h
VISUAL_USERCONFIG opt_userconfig.h
USERCONFIG_BOOT opt_userconfig.h
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 161e73d..9b855c1 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.41 1997/04/27 20:01:47 peter Exp $
+# $Id: options.i386,v 1.42 1997/04/28 00:24:28 fsmp Exp $
XXXCreateMe opt_global.h
BOUNCEPAGES opt_bounce.h
@@ -88,6 +88,8 @@ KBDIO_DEBUG opt_kbdio.h
ATAPI opt_atapi.h
ATAPI_STATIC opt_atapi.h
+CMD640 opt_wd.h
+
USERCONFIG opt_userconfig.h
VISUAL_USERCONFIG opt_userconfig.h
USERCONFIG_BOOT opt_userconfig.h
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 401a35f..2c6da79 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
- * $Id: wd.c,v 1.127 1997/03/24 11:24:12 bde Exp $
+ * $Id: wd.c,v 1.128 1997/04/03 09:43:50 phk Exp $
*/
/* TODO:
@@ -61,6 +61,7 @@
#endif
#include "wdc.h"
+#include "opt_wd.h"
#include "opt_atapi.h"
#if NWDC > 0
diff --git a/sys/pci/wdc_p.c b/sys/pci/wdc_p.c
index 7f2cd70..db9fffa 100644
--- a/sys/pci/wdc_p.c
+++ b/sys/pci/wdc_p.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id$
+ * $Id: wdc_p.c,v 1.1 1997/03/11 23:17:26 se Exp $
*/
/*
@@ -26,6 +26,7 @@
#include "pci.h"
#if NPCI > 0
+#include "opt_wd.h"
#ifdef CMD640
#include <sys/param.h>
OpenPOWER on IntegriCloud