summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2003-08-15 23:41:48 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2003-08-15 23:41:48 +0000
commitb3faad62d2d04bf0c1c49b05a39242d78c0095ac (patch)
tree038ad46ceea084b365d4d0841c39d872d3d69ffd
parentcccde189d91e9b3ab6fe8a3aa1f98da1b1af39d7 (diff)
cleanup.
-rw-r--r--sys/dev/ic/smc93cx6.c4
-rw-r--r--sys/dev/ic/smc93cx6var.h9
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/ic/smc93cx6.c b/sys/dev/ic/smc93cx6.c
index a30616a5e82..5f048f79ad7 100644
--- a/sys/dev/ic/smc93cx6.c
+++ b/sys/dev/ic/smc93cx6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smc93cx6.c,v 1.15 2003/08/12 10:27:10 fgsch Exp $ */
+/* $OpenBSD: smc93cx6.c,v 1.16 2003/08/15 23:41:47 fgsch Exp $ */
/* $FreeBSD: sys/dev/aic7xxx/93cx6.c,v 1.5 2000/01/07 23:08:17 gibbs Exp $ */
/*
* Interface for the 93C66/56/46/26/06 serial eeprom parts.
@@ -58,8 +58,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/bus.h>
-#include <dev/ic/aic7xxx_openbsd.h>
-#include <dev/ic/aic7xxx_inline.h>
#include <dev/ic/smc93cx6var.h>
/*
diff --git a/sys/dev/ic/smc93cx6var.h b/sys/dev/ic/smc93cx6var.h
index 13c7652938d..b888c20300c 100644
--- a/sys/dev/ic/smc93cx6var.h
+++ b/sys/dev/ic/smc93cx6var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smc93cx6var.h,v 1.15 2003/08/15 23:01:01 fgsch Exp $ */
+/* $OpenBSD: smc93cx6var.h,v 1.16 2003/08/15 23:41:47 fgsch Exp $ */
/* $FreeBSD: sys/dev/aic7xxx/93cx6.h,v 1.3 1999/12/29 04:35:33 peter Exp $ */
/*
* Interface to the 93C46 serial EEPROM that is used to store BIOS
@@ -40,9 +40,6 @@
#define _SMC93CX6VAR_H_
#include <sys/param.h>
-#if !(defined(__NetBSD__) || defined(__OpenBSD__))
-#include <sys/systm.h>
-#endif
#ifdef _KERNEL
@@ -114,8 +111,8 @@ do { \
: bus_space_read_1((sd)->sd_tag, (sd)->sd_bsh, \
(sd)->sd_dataout_offset))
-int read_seeprom(struct seeprom_descriptor *, u_int16_t *,
- bus_size_t, bus_size_t);
+int read_seeprom(struct seeprom_descriptor *, u_int16_t *,
+ bus_size_t, bus_size_t);
#endif /* _KERNEL */
#endif /* _SMC93CX6VAR_H_ */