]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MIPS] s/__ASSEMBLER__/__ASSEMBLY__/ for clarity sake.
authorRalf Baechle <ralf@linux-mips.org>
Mon, 25 Sep 2006 14:49:49 +0000 (15:49 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 27 Sep 2006 12:37:57 +0000 (13:37 +0100)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
include/asm-mips/hazards.h
include/asm-mips/mach-excite/excite.h
include/asm-mips/sibyte/sb1250_defs.h
include/asm-mips/sibyte/sb1250_scd.h

index bf0b80404946a6dbf7849faf1627d099ae48228d..0fe02945feba0b8a18868126a99d977558294d33 100644 (file)
@@ -11,7 +11,7 @@
 #define _ASM_HAZARDS_H
 
 
-#ifdef __ASSEMBLER__
+#ifdef __ASSEMBLY__
 #define ASMMACRO(name, code...) .macro name; code; .endm
 #else
 
index 130bd4b8edcea3210b703a9e441a09826ecb3587..4c29ba44992c11e8b1ffce23099b34dba6906512 100644 (file)
@@ -7,7 +7,7 @@
 
 #define EXCITE_CPU_EXT_CLOCK 100000000
 
-#if !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLY__)
 void __init excite_kgdb_init(void);
 void excite_procfs_init(void);
 extern unsigned long memsize;
index 335dbaf1d8319a1e1d2c352b12fa75e68e6652ce..a885491217c18da6d6515563e783dce1c11d881a 100644 (file)
  * Note: you'll need to define uint32_t and uint64_t in your headers.
  */
 
-#if !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLY__)
 #define _SB_MAKE64(x) ((uint64_t)(x))
 #define _SB_MAKE32(x) ((uint32_t)(x))
 #else
  */
 
 
-#if defined(__mips64) && !defined(__ASSEMBLER__)
+#if defined(__mips64) && !defined(__ASSEMBLY__)
 #define SBWRITECSR(csr,val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val)
 #define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr)))
-#endif /* __ASSEMBLER__ */
+#endif /* __ASSEMBLY__ */
 
 #endif
index f4178bdcfcb08636ec4985a8e52de6d784ae7372..7ed0bb611e56131035cad690422cd49fdbeed224 100644 (file)
  * (For the assembler version, sysrev and dest may be the same register.
  * Also, it clobbers AT.)
  */
-#ifdef __ASSEMBLER__
+#ifdef __ASSEMBLY__
 #define SYS_SOC_TYPE(dest, sysrev)                                     \
        .set push ;                                                     \
        .set reorder ;                                                  \