X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/7e41aa883dd258f888d0470250eead40a53ef1f5..3903760236c30e3b5ace7a4eefac3a269d68957c:/osfmk/mach/machine.h

diff --git a/osfmk/mach/machine.h b/osfmk/mach/machine.h
index 09ea8bb8a..c057fb799 100644
--- a/osfmk/mach/machine.h
+++ b/osfmk/mach/machine.h
@@ -385,8 +385,6 @@ __END_DECLS
 #define CPUFAMILY_POWERPC_G4		0x77c184ae
 #define CPUFAMILY_POWERPC_G5		0xed76d8aa
 #define CPUFAMILY_INTEL_6_13		0xaa33392b
-#define CPUFAMILY_INTEL_YONAH		0x73d67300
-#define CPUFAMILY_INTEL_MEROM		0x426f69ef
 #define CPUFAMILY_INTEL_PENRYN		0x78ea4fbc
 #define CPUFAMILY_INTEL_NEHALEM		0x6b5a4cd2
 #define CPUFAMILY_INTEL_WESTMERE	0x573b5eec
@@ -398,7 +396,7 @@ __END_DECLS
 #define CPUFAMILY_ARM_9			0xe73283ae
 #define CPUFAMILY_ARM_11		0x8ff620d8
 #define CPUFAMILY_ARM_XSCALE		0x53b005f5
-#define CPUFAMILY_ARM_12		0xbd1b0ae9
+#define CPUFAMILY_ARM_12                0xbd1b0ae9
 #define CPUFAMILY_ARM_13		0x0cc90e64
 #define CPUFAMILY_ARM_14		0x96077ef1
 #define CPUFAMILY_ARM_15		0xa8511bca
@@ -406,15 +404,11 @@ __END_DECLS
 #define CPUFAMILY_ARM_CYCLONE		0x37a09642
 #define CPUFAMILY_ARM_TYPHOON		0x2c91a47e
 #define CPUFAMILY_ARM_TWISTER		0x92fb37c8
+#define CPUFAMILY_ARM_HURRICANE		0x67ceee93
 
 /* The following synonyms are deprecated: */
-#define CPUFAMILY_INTEL_6_14	CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_6_15	CPUFAMILY_INTEL_MEROM
 #define CPUFAMILY_INTEL_6_23	CPUFAMILY_INTEL_PENRYN
 #define CPUFAMILY_INTEL_6_26	CPUFAMILY_INTEL_NEHALEM
 
-#define CPUFAMILY_INTEL_CORE	CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_CORE2	CPUFAMILY_INTEL_MEROM
-
 
 #endif	/* _MACH_MACHINE_H_ */