sata_nv: don't rely on NV_INT_DEV indication with ADMA

[~andy/linux] / include / asm-mips / asm.h

diff --git a/include/asm-mips/asm.h b/include/asm-mips/asm.h
index f53237772985b50d4bf199562ab6933b54584bc1..838eb3144d8188dc0938a48ef9a96c6380a62846 100644 (file)
--- a/include/asm-mips/asm.h
+++ b/include/asm-mips/asm.h
@@ -17,7 +17,6 @@
 #ifndef __ASM_ASM_H
 #define __ASM_ASM_H
 
-#include <linux/config.h>
 #include <asm/sgidefs.h>
 
 #ifndef CAT
@@ -107,6 +106,7 @@ symbol              =       value
 /*
  * Print formatted string
  */
+#ifdef CONFIG_PRINTK
 #define PRINT(string)                                   \
                .set    push;                           \
                .set    reorder;                        \
@@ -114,6 +114,9 @@ symbol              =       value
                jal     printk;                         \
                .set    pop;                            \
                TEXT(string)
+#else
+#define PRINT(string)
+#endif
 
 #define        TEXT(msg)                                       \
                .pushsection .data;                     \
@@ -341,6 +344,7 @@ symbol              =       value
 #define PTR_L          lw
 #define PTR_S          sw
 #define PTR_LA         la
+#define PTR_LI         li
 #define PTR_SLL                sll
 #define PTR_SLLV       sllv
 #define PTR_SRL                srl
@@ -365,6 +369,7 @@ symbol              =       value
 #define PTR_L          ld
 #define PTR_S          sd
 #define PTR_LA         dla
+#define PTR_LI         dli
 #define PTR_SLL                dsll
 #define PTR_SLLV       dsllv
 #define PTR_SRL                dsrl