diff options
| author | asami <asami@FreeBSD.org> | 1996-09-04 09:52:31 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-09-04 09:52:31 +0000 |
| commit | 9bf474dc1e6d9eda38fd3d0b4b72f26eaa306ecd (patch) | |
| tree | 784172c0281277db3ea5b72c9be638370c5ac3b6 /sys/i386/isa/isa_device.h | |
| parent | dc61174b7260da9e4f07164b67bcd25e90183745 (diff) | |
| download | FreeBSD-src-9bf474dc1e6d9eda38fd3d0b4b72f26eaa306ecd.zip FreeBSD-src-9bf474dc1e6d9eda38fd3d0b4b72f26eaa306ecd.tar.gz | |
More merge.
(1) Remove mk30line (moved to /usr/sbin, but not in our source tree yet)
(2) Delete unneeded (well, harmful now :) code to prohibit #including
of isa_device.h from PC98 sources.
(3) Remove files now equal to their ISA/PC-AT counterparts.
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/i386/isa/isa_device.h')
| -rw-r--r-- | sys/i386/isa/isa_device.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 996a08a..3612bb4 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,13 +31,9 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.29 1996/04/08 19:38:57 smpatel Exp $ + * $Id: isa_device.h,v 1.30 1996/06/14 11:01:19 asami Exp $ */ -#ifdef PC98 -#error isa_device.h is included from PC-9801 source -#endif - #ifndef _I386_ISA_ISA_DEVICE_H_ #define _I386_ISA_ISA_DEVICE_H_ |
