diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-11 00:51:22 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-11 00:51:22 +0000 |
| commit | c82355ec6d2a6dc42c55fb8415127dbd396e68f4 (patch) | |
| tree | cbe6d262939d2167d9b27455c61599b79a74904c /sys/arch/alpha | |
| parent | 71e24e69f3b746c9ee184441951041df7f362842 (diff) | |
Remove DISKLABEL_ALL, DISKLABEL_ALPHA, leave DISKLABEL_I386 in
GENERIC. Remove now superfluous check for DISKLABEL_ALL.
'whack whack whack!' deraadt@
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/disksubr.c | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c index 4d788638fdf..e87012f76e4 100644 --- a/sys/arch/alpha/alpha/disksubr.c +++ b/sys/arch/alpha/alpha/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.47 2006/07/09 21:00:17 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.48 2006/07/11 00:51:21 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -48,11 +48,6 @@ #include <sys/syslog.h> #include <sys/disk.h> -/* The native defaults... */ -#if defined(DISKLABEL_ALL) && !defined(DISKLABEL_I386) -#define DISKLABEL_I386 -#endif - char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, int, struct disklabel *, int); #if defined(DISKLABEL_I386) diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index ece37bc95b3..7436c03c1d3 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.174 2006/06/22 01:54:53 dlg Exp $ +# $OpenBSD: GENERIC,v 1.175 2006/07/11 00:51:21 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -32,9 +32,7 @@ option COMPAT_OSF1 # OSF/1 binary compatibility option COMPAT_NETBSD # NetBSD compatibility # Disklabel compatibility options -option DISKLABEL_ALL # All of the ones mentioned below -#option DISKLABEL_ALPHA # Redundant, just here for completeness -#option DISKLABEL_I386 # i386/arc style of partitioning +option DISKLABEL_I386 # i386/arc style of partitioning # Misc. options option EISAVERBOSE # recognize "unknown" EISA devices |