Index: kernel/arch/sparc64/include/sun4v/arch.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/arch.h	(revision 18baf9c0c35a8ee98eda033f039299251c422462)
+++ kernel/arch/sparc64/include/sun4v/arch.h	(revision f2b3d3ea3dc1fbb7a2312b326613bcc88a3bfaf5)
@@ -58,9 +58,4 @@
 #define SCRATCHPAD_WBUF		0x18
 
-//MH - remove when cpu.h is forked
-#define ASI_NUCLEUS_QUAD_LDD	0x24	/** ASI for 16-byte atomic loads. */
-#define ASI_DCACHE_TAG		0x47	/** ASI D-Cache Tag. */
-#define ASI_ICBUS_CONFIG	0x4a	/** ASI of the UPA_CONFIG/FIREPLANE_CONFIG register. */
-
 #endif