From 2f86e398e13886afc84375761c323f772f8ebe70 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 28 Mar 1995 12:29:11 +0000
Subject: [PATCH] CVS:

The previous patch was botched.
---
 sys/dev/cy/cy.c     | 8 ++++----
 sys/dev/cy/cy_isa.c | 8 ++++----
 sys/i386/isa/cy.c   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 03e561c2ce0..a37292e6d46 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.4 1995/02/28 00:20:52 pst Exp $
+ *	$Id: cy.c,v 1.5 1995/03/28 07:55:25 bde Exp $
  */
 
 /*
@@ -82,14 +82,14 @@
 #include <machine/cpu.h>
 #ifdef NetBSD
 #include <machine/pio.h>
-#endif
 #include <machine/cpufunc.h>
+#else
+#include <machine/clock.h>
+#endif
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/cd1400.h>
 
-#else
-#include <machine/clock.h>
 #define RxFifoThreshold	3	/* 3 characters (out of 12) in the receive
 				 * FIFO before an interrupt is generated
 				 */
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 03e561c2ce0..a37292e6d46 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.4 1995/02/28 00:20:52 pst Exp $
+ *	$Id: cy.c,v 1.5 1995/03/28 07:55:25 bde Exp $
  */
 
 /*
@@ -82,14 +82,14 @@
 #include <machine/cpu.h>
 #ifdef NetBSD
 #include <machine/pio.h>
-#endif
 #include <machine/cpufunc.h>
+#else
+#include <machine/clock.h>
+#endif
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/cd1400.h>
 
-#else
-#include <machine/clock.h>
 #define RxFifoThreshold	3	/* 3 characters (out of 12) in the receive
 				 * FIFO before an interrupt is generated
 				 */
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 03e561c2ce0..a37292e6d46 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.4 1995/02/28 00:20:52 pst Exp $
+ *	$Id: cy.c,v 1.5 1995/03/28 07:55:25 bde Exp $
  */
 
 /*
@@ -82,14 +82,14 @@
 #include <machine/cpu.h>
 #ifdef NetBSD
 #include <machine/pio.h>
-#endif
 #include <machine/cpufunc.h>
+#else
+#include <machine/clock.h>
+#endif
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/cd1400.h>
 
-#else
-#include <machine/clock.h>
 #define RxFifoThreshold	3	/* 3 characters (out of 12) in the receive
 				 * FIFO before an interrupt is generated
 				 */