From 8540a31ee3b3851f1271dce343311565b552498b Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Thu, 15 Jan 1998 01:26:13 +0000
Subject: [PATCH] kill a couple of unnecessary #ifs

---
 sys/dev/ata/wd.c |  8 +-------
 sys/dev/ic/wdc.c | 10 +---------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 9aa5294dcc12..efdafc49af8c 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.168 1998/01/14 23:41:59 cgd Exp $ */
+/*	$NetBSD: wd.c,v 1.169 1998/01/15 01:26:13 cgd Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -103,13 +103,7 @@ struct cfattach wd_ca = {
 	sizeof(struct wd_softc), wdprobe, wdattach
 };
 
-#if (NetBSD > 199801 || NetBSD1_3 >= 3)
 extern struct cfdriver wd_cd;
-#else
-struct cfdriver wd_cd = {
-	NULL, "wd", DV_DISK
-};
-#endif
 
 void	wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *));
 void	wdgetdisklabel	__P((struct wd_softc *));
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 29ddce625843..c317db70d33d 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc.c,v 1.12 1998/01/14 23:42:02 cgd Exp $ */
+/*	$NetBSD: wdc.c,v 1.13 1998/01/15 01:26:16 cgd Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -93,14 +93,6 @@
 
 LIST_HEAD(xfer_free_list, wdc_xfer) xfer_free_list;
 
-#if (NetBSD > 199801 || NetBSD1_3 >= 3)
-/* XXX nothing needed here */
-#else
-struct cfdriver wdc_cd = {
-	NULL, "wdc", DV_DULL
-};
-#endif
-
 int	wdc_init_controller __P((struct wdc_softc *,
 	    const struct wdc_attachment_data *));
 void	wdcstart	__P((struct wdc_softc *));