Module Name: src
Committed By: dholland
Date: Tue Feb 22 07:12:29 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: mainbus.c
Log Message:
Fix build in admittedly quixotic case with IPMI but no PCI or ACPI.
(ACPI currently doesn't work without PCI, fwiw.)
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/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/amd64/amd64/mainbus.c
diff -u src/sys/arch/amd64/amd64/mainbus.c:1.31 src/sys/arch/amd64/amd64/mainbus.c:1.32
--- src/sys/arch/amd64/amd64/mainbus.c:1.31 Wed Apr 28 19:17:03 2010
+++ src/sys/arch/amd64/amd64/mainbus.c Tue Feb 22 07:12:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.31 2010/04/28 19:17:03 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.32 2011/02/22 07:12:29 dholland 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.31 2010/04/28 19:17:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32 2011/02/22 07:12:29 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,9 +149,11 @@
void
mainbus_attach(device_t parent, device_t self, void *aux)
{
+#if NPCI > 0 || NACPICA > 0 || NIPMI > 0
+ union mainbus_attach_args mba;
+#endif
#if NPCI > 0
int mode;
- union mainbus_attach_args mba;
#endif
#if NACPICA > 0
int acpi_present = 0;
