---

yaml --- r: 309535 b: refs/heads/master c: b0acd24 h: refs/heads/master i: 309533: aacf614 309531: 5626908 309527: 477769b 309519: 9ac25dc 309503: 566e2eb v: v3
git-mirror · May 28, 2012 · 5fe74cb · 5fe74cb
1 parent fd46167
commit 5fe74cb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6729cf7967f6c11f6de6a0b43ec277905a00c146
+refs/heads/master: b0acd2495e2a7f2655b9d4c761bd09e6dd05fbc4
diff --git a/trunk/arch/sparc/include/asm/asi.h b/trunk/arch/sparc/include/asm/asi.h
@@ -40,11 +40,7 @@
 #define ASI_M_UNA01         0x01   /* Same here... */
 #define ASI_M_MXCC          0x02   /* Access to TI VIKING MXCC registers */
 #define ASI_M_FLUSH_PROBE   0x03   /* Reference MMU Flush/Probe; rw, ss */
-#ifndef CONFIG_SPARC_LEON
 #define ASI_M_MMUREGS       0x04   /* MMU Registers; rw, ss */
-#else
-#define ASI_M_MMUREGS       0x19
-#endif /* CONFIG_SPARC_LEON */
 #define ASI_M_TLBDIAG       0x05   /* MMU TLB only Diagnostics */
 #define ASI_M_DIAGS         0x06   /* Reference MMU Diagnostics */
 #define ASI_M_IODIAG        0x07   /* MMU I/O TLB only Diagnostics */