summaryrefslogtreecommitdiffstats
path: root/sys/dev/cy
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-03-28 12:29:11 +0000
committerbde <bde@FreeBSD.org>1995-03-28 12:29:11 +0000
commitd8eb7d083387d8c95af5dff4cbacff0de7e2514a (patch)
treea88ec184e1ea5dd350a1df9d3258caabf542af45 /sys/dev/cy
parentffb698bc12c7f10026218df04cbefb70c3e84b53 (diff)
downloadFreeBSD-src-d8eb7d083387d8c95af5dff4cbacff0de7e2514a.zip
FreeBSD-src-d8eb7d083387d8c95af5dff4cbacff0de7e2514a.tar.gz
CVS:
The previous patch was botched.
Diffstat (limited to 'sys/dev/cy')
-rw-r--r--sys/dev/cy/cy.c8
-rw-r--r--sys/dev/cy/cy_isa.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 03e561c..a37292e 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 03e561c..a37292e 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
*/
OpenPOWER on IntegriCloud