diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
| commit | e30f001135d8f835c2d750ae17c91268fa9d0bb2 (patch) | |
| tree | 37f74d6fdf54e31c6c6d69a11d50e299cd0a1118 /sys/amd64/amd64/prof_machdep.c | |
| parent | 75680b05c6efe55e93b863d2673eb9b36ac5fa6d (diff) | |
| download | src-e30f001135d8f835c2d750ae17c91268fa9d0bb2.tar.gz src-e30f001135d8f835c2d750ae17c91268fa9d0bb2.zip | |
More merge and update.
(1) deleted #if 0
pc98/pc98/mse.c
(2) hold per-unit I/O ports in ed_softc
pc98/pc98/if_ed.c
pc98/pc98/if_ed98.h
(3) merge more files by segregating changes into headers.
new file (moved from pc98/pc98):
i386/isa/aic_98.h
deleted:
well, it's already in the commit message so I won't repeat the
long list here ;)
Submitted by: The FreeBSD(98) Development Team
Notes
Notes:
svn path=/head/; revision=19269
Diffstat (limited to 'sys/amd64/amd64/prof_machdep.c')
| -rw-r--r-- | sys/amd64/amd64/prof_machdep.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c index 62c8df514b09..a8603cb7968d 100644 --- a/sys/amd64/amd64/prof_machdep.c +++ b/sys/amd64/amd64/prof_machdep.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: prof_machdep.c,v 1.2 1996/04/08 16:41:06 wollman Exp $ + * $Id: prof_machdep.c,v 1.3 1996/10/17 19:32:10 bde Exp $ */ #ifdef GUPROF @@ -40,7 +40,11 @@ #include <machine/profile.h> #endif +#ifdef PC98 +#include <pc98/pc98/pc98.h> +#else #include <i386/isa/isa.h> +#endif #include <i386/isa/timerreg.h> #ifdef GUPROF |