diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-09 21:06:40 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-09 21:06:40 +0000 |
| commit | c73409d2099e452045816536a14c14df32da58ea (patch) | |
| tree | 478be12e3562f916b023967d4dcd7463600de7d4 | |
| parent | a9f046bdb7894ff32681468beb72327606bda12e (diff) | |
DISKLABEL_ALL was never used in hppa, hppa64, mips64 config files so
just eliminate the check to set DISKLABEL_I386 with it. If you want
DISKLABEL_I386, use that option.
| -rw-r--r-- | sys/arch/hppa/hppa/disksubr.c | 7 | ||||
| -rw-r--r-- | sys/arch/hppa64/hppa64/disksubr.c | 7 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/disksubr.c | 7 |
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c index 3c3c4597bb1..9a6496b9b7c 100644 --- a/sys/arch/hppa/hppa/disksubr.c +++ b/sys/arch/hppa/hppa/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.27 2006/07/07 23:47:37 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.28 2006/07/09 21:06:39 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -50,11 +50,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/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c index d6dfe643b3a..4306a07ea5e 100644 --- a/sys/arch/hppa64/hppa64/disksubr.c +++ b/sys/arch/hppa64/hppa64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.10 2006/07/07 23:47:37 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.11 2006/07/09 21:06:39 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -50,11 +50,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/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c index 00b869f19a7..b45ad969ca5 100644 --- a/sys/arch/mips64/mips64/disksubr.c +++ b/sys/arch/mips64/mips64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.16 2006/07/07 23:47:37 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.17 2006/07/09 21:06:39 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -50,11 +50,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) |