[src/trunk]: src/sys/arch/i386/i386 Fix build.

[dsl <dsl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6aaf0366452e
branches:  trunk
changeset: 781786:6aaf0366452e
user:      dsl <dsl%NetBSD.org@localhost>
date:      Sun Sep 30 20:54:52 2012 +0000

description:
Fix build.
I've removed 'option apmbios' so config no longer generates apmbios.h
Not to be confused with dev/apm/apmbios.h :-)

diffstat:

 sys/arch/i386/i386/genassym.cf |  5 +----
 sys/arch/i386/i386/machdep.c   |  5 ++---
 sys/arch/i386/i386/mainbus.c   |  5 ++---
 3 files changed, 5 insertions(+), 10 deletions(-)

diffs (71 lines):

diff -r 73a8ad0db04e -r 6aaf0366452e sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Sun Sep 30 20:49:12 2012 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Sun Sep 30 20:54:52 2012 +0000
@@ -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 @@
 
 if defined(_KERNEL) && defined(_KERNEL_OPT)
 include "ioapic.h"
-ifndef XEN
-include "apmbios.h"
-endif
 endif
 
 include <compat/sys/signal.h>
diff -r 73a8ad0db04e -r 6aaf0366452e sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Sun Sep 30 20:49:12 2012 +0000
+++ b/sys/arch/i386/i386/machdep.c      Sun Sep 30 20:54:52 2012 +0000
@@ -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 @@
 #endif
 
 #include "acpica.h"
-#include "apmbios.h"
 #include "bioscall.h"
 
 #if NBIOSCALL > 0
diff -r 73a8ad0db04e -r 6aaf0366452e sys/arch/i386/i386/mainbus.c
--- a/sys/arch/i386/i386/mainbus.c      Sun Sep 30 20:49:12 2012 +0000
+++ b/sys/arch/i386/i386/mainbus.c      Sun Sep 30 20:54:52 2012 +0000
@@ -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 @@
 #include "isa.h"
 #include "isadma.h"
 #include "mca.h"
-#include "apmbios.h"
 #include "pnpbios.h"
 #include "acpica.h"
 #include "ipmi.h"