summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2021-11-19 18:38:56 +0100
committerAlejandro Colomar <alx.manpages@gmail.com>2021-11-20 14:45:30 +0100
commit95a5dd02310dd40e54a37f782f07235192a22664 (patch)
treedacace6fe33abca2a2af40227ddfd2b4800a1ab2
parent0e1f3fb47007ca93df6f2b998868c892258e6ea9 (diff)
arch/mips/: Don't redefine NULL
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rw-r--r--arch/mips/include/asm/fw/arc/hinv.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/include/asm/fw/arc/hinv.h b/arch/mips/include/asm/fw/arc/hinv.h
index d67b6a90f9b3..7705c45ddcd0 100644
--- a/arch/mips/include/asm/fw/arc/hinv.h
+++ b/arch/mips/include/asm/fw/arc/hinv.h
@@ -7,6 +7,7 @@
#include <asm/sgidefs.h>
#include <asm/fw/arc/types.h>
+#include <linux/NULL.h>
/* configuration query defines */
typedef enum configclass {
@@ -93,10 +94,6 @@ typedef enum {
Output = 64
} IDENTIFIERFLAG;
-#ifndef NULL /* for GetChild(NULL); */
-#define NULL 0
-#endif
-
union key_u {
struct {
#ifdef _MIPSEB