diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-11-27 14:17:42 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-11-27 14:17:42 +0000 |
| commit | 91105cad4986d51fb4a9c70d116795e1ae774125 (patch) | |
| tree | e2dac016a5f34fa6c84e3a68843d4e9b78a46c58 | |
| parent | b6f50d00187650bf55a15449234ab6779ba96a30 (diff) | |
Nuke autoconf.h commons.
| -rw-r--r-- | sys/arch/mvme68k/include/autoconf.h | 12 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/autoconf.c | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h index 0ffe2051fa7..d990f81f813 100644 --- a/sys/arch/mvme68k/include/autoconf.h +++ b/sys/arch/mvme68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.11 2005/11/24 22:43:19 miod Exp $ */ +/* $OpenBSD: autoconf.h,v 1.12 2005/11/27 14:17:39 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,12 +48,12 @@ struct confargs { #define BUS_IP 7 /* VME162 IP module bus */ /* the following are from the prom/bootblocks */ -paddr_t bootaddr; /* PA of boot device */ -int bootctrllun; /* ctrl_lun of boot device */ -int bootdevlun; /* dev_lun of boot device */ -int bootpart; /* boot partition (disk) */ +extern paddr_t bootaddr; /* PA of boot device */ +extern int bootctrllun; /* ctrl_lun of boot device */ +extern int bootdevlun; /* dev_lun of boot device */ +extern int bootpart; /* boot partition (disk) */ -struct device *bootdv; /* boot device */ +extern struct device *bootdv; /* boot device */ vaddr_t mapiodev(paddr_t, int); void unmapiodev(vaddr_t, int); diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c index 4b89c409631..d51670377c1 100644 --- a/sys/arch/mvme68k/mvme68k/autoconf.c +++ b/sys/arch/mvme68k/mvme68k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.29 2005/11/24 22:43:19 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.30 2005/11/27 14:17:41 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -97,6 +97,11 @@ struct device *parsedisk(char *, int, int, dev_t *); extern void init_intrs(void); extern void dumpconf(void); +/* boot device information */ +paddr_t bootaddr; +int bootctrllun, bootdevlun, bootpart; +struct device *bootdv; + /* * XXX some storage space must be allocated statically because of * early console init |