summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/amd64/mainbus.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index a07542b4be9..42a3f8e38df 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.6 2006/03/13 20:10:49 brad Exp $ */
+/* $OpenBSD: mainbus.c,v 1.7 2006/04/14 21:33:56 marco Exp $ */
/* $NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $ */
/*
@@ -127,23 +127,20 @@ int mp_verbose = 0;
int
mainbus_match(struct device *parent, void *match, void *aux)
{
-
- return 1;
+ return (1);
}
/*
* Attach the mainbus.
*/
void
-mainbus_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+mainbus_attach(struct device *parent, struct device *self, void *aux)
{
#if NPCI > 0
- union mainbus_attach_args mba;
+ union mainbus_attach_args mba;
#endif
#ifdef MPBIOS
- int mpbios_present = 0;
+ int mpbios_present = 0;
#endif
printf("\n");
@@ -219,15 +216,14 @@ mainbus_attach(parent, self, aux)
}
int
-mainbus_print(aux, pnp)
- void *aux;
- const char *pnp;
+mainbus_print(void *aux, const char *pnp)
{
- union mainbus_attach_args *mba = aux;
+ union mainbus_attach_args *mba = aux;
if (pnp)
printf("%s at %s", mba->mba_busname, pnp);
if (strcmp(mba->mba_busname, "pci") == 0)
printf(" bus %d", mba->mba_pba.pba_bus);
+
return (UNCONF);
}