diff options
| author | asami <asami@FreeBSD.org> | 1996-06-14 11:02:28 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-06-14 11:02:28 +0000 |
| commit | 36a1932601c730683d263ee933dd90cd6dae96bf (patch) | |
| tree | d76ce0bf0a31500c82596831333ff034e969773b /sys/pci | |
| parent | 5fa995752f02a42fcb2b0ca54149fef141f98060 (diff) | |
| download | FreeBSD-src-36a1932601c730683d263ee933dd90cd6dae96bf.zip FreeBSD-src-36a1932601c730683d263ee933dd90cd6dae96bf.tar.gz | |
The Great PC98 Merge.
All new code is "#ifdef PC98"ed so this should make no difference to
PC/AT (and its clones) users.
Ok'd by: core
Submitted by: FreeBSD(98) development team
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_ed_p.c | 6 | ||||
| -rw-r--r-- | sys/pci/wd82371.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c index ce46c07..eb0391a 100644 --- a/sys/pci/if_ed_p.c +++ b/sys/pci/if_ed_p.c @@ -17,7 +17,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: if_ed_p.c,v 1.1 1996/05/18 17:56:40 se Exp $ + * $Id: if_ed_p.c,v 1.2 1996/06/11 00:51:49 alex Exp $ */ #include <pci.h> @@ -29,7 +29,11 @@ #include <sys/kernel.h> #include <pci/pcireg.h> #include <pci/pcivar.h> +#ifdef PC98 +#include <pc98/pc98/pc98_device.h> +#else #include <i386/isa/isa_device.h> +#endif #include <ed.h> diff --git a/sys/pci/wd82371.c b/sys/pci/wd82371.c index 72ceb19..b5fbce1 100644 --- a/sys/pci/wd82371.c +++ b/sys/pci/wd82371.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: wd82371.c,v 1.3 1996/04/07 17:39:17 bde Exp $ + * $Id: wd82371.c,v 1.4 1996/05/02 14:20:50 phk Exp $ */ #include "pci.h" @@ -44,7 +44,11 @@ #include <machine/pmap.h> /* for vtophys */ +#ifdef PC98 +#include <pc98/pc98/wdreg.h> +#else #include <i386/isa/wdreg.h> +#endif #include <pci/pcivar.h> #include <pci/pcireg.h> |
