diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 96533881accf..c838993b8f14 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -55,7 +55,7 @@ */ /* XXX these should be defined per controller (or drive) elsewhere, not here! */ -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__amd64__) || defined(__ia64__) #define LABELSECTOR 1 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ #endif @@ -65,24 +65,6 @@ #define LABELOFFSET 64 #endif -#ifdef __ia64__ -#define LABELSECTOR 1 -#define LABELOFFSET 0 -#endif - -#ifdef __sparc64__ -#define LABELSECTOR 0 -#define LABELOFFSET 128 -#endif - -#ifndef LABELSECTOR -#define LABELSECTOR 0 -#endif - -#ifndef LABELOFFSET -#define LABELOFFSET 64 -#endif - #define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */ #ifndef MAXPARTITIONS #define MAXPARTITIONS 8