Sync with trunk version.

b59c9309 · Mike Hibler · 285a9b46 · b59c9309
Commit b59c9309 authored Dec 03, 2014 by Mike Hibler
--- a/clientside/os/imagezip/ffs/disklabel.h
+++ b/clientside/os/imagezip/ffs/disklabel.h
@@ -52,7 +52,7 @@
 /* XXX these should be defined per controller (or drive) elsewhere, not here! */
 #if defined(__linux__) || \
    defined(__i386__) || defined(__amd64__) || defined(__arm__) || \
-    defined(__ia64__) || defined(__powerpc__) || defined(__aarch64__)
+    defined(__ia64__) || defined(__powerpc__)
 #define LABELSECTOR	1			/* sector containing label */
 #define LABELOFFSET	0			/* offset of label in sector */
 #endif