Module Name: src
Committed By: dsl
Date: Sun Sep 30 20:54:52 UTC 2012
Modified Files:
src/sys/arch/i386/i386: genassym.cf machdep.c mainbus.c
Log Message:
Fix build.
I've removed 'option apmbios' so config no longer generates apmbios.h
Not to be confused with dev/apm/apmbios.h :-)
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.731 -r1.732 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/i386/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.93 src/sys/arch/i386/i386/genassym.cf:1.94
--- src/sys/arch/i386/i386/genassym.cf:1.93 Sun Sep 30 20:19:51 2012
+++ src/sys/arch/i386/i386/genassym.cf Sun Sep 30 20:54:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.93 2012/09/30 20:19:51 dsl Exp $
+# $NetBSD: genassym.cf,v 1.94 2012/09/30 20:54:52 dsl Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -104,9 +104,6 @@ endif
if defined(_KERNEL) && defined(_KERNEL_OPT)
include "ioapic.h"
-ifndef XEN
-include "apmbios.h"
-endif
endif
include <compat/sys/signal.h>
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.731 src/sys/arch/i386/i386/machdep.c:1.732
--- src/sys/arch/i386/i386/machdep.c:1.731 Sun Sep 30 20:19:51 2012
+++ src/sys/arch/i386/i386/machdep.c Sun Sep 30 20:54:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.731 2012/09/30 20:19:51 dsl Exp $ */
+/* $NetBSD: machdep.c,v 1.732 2012/09/30 20:54:52 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.731 2012/09/30 20:19:51 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.732 2012/09/30 20:54:52 dsl Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -177,7 +177,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#endif
#include "acpica.h"
-#include "apmbios.h"
#include "bioscall.h"
#if NBIOSCALL > 0
Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.95 src/sys/arch/i386/i386/mainbus.c:1.96
--- src/sys/arch/i386/i386/mainbus.c:1.95 Sun Sep 30 20:19:52 2012
+++ src/sys/arch/i386/i386/mainbus.c Sun Sep 30 20:54:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.95 2012/09/30 20:19:52 dsl Exp $ */
+/* $NetBSD: mainbus.c,v 1.96 2012/09/30 20:54:52 dsl Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.95 2012/09/30 20:19:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.96 2012/09/30 20:54:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include "isa.h"
#include "isadma.h"
#include "mca.h"
-#include "apmbios.h"
#include "pnpbios.h"
#include "acpica.h"
#include "ipmi.h"
