summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Pei <huangpei@loongson.cn>2021-11-23 19:07:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-08 19:04:10 +0100
commit8f9df98d455970497c866c94e8d56d1bb98c27f9 (patch)
tree1d358f5b6c7cb7d731ec69466c0860731e1be432
parenta6a21ff5cfc21be757e4b825acf873eabc3bb4e2 (diff)
hamradio: fix macro redefine warning
commit 16517829f2e02f096fb5ea9083d160381127faf3 upstream. MIPS/IA64 define END as assembly function ending, which conflict with END definition in mkiss.c, just undef it at first Reported-by: lkp@intel.com Signed-off-by: Huang Pei <huangpei@loongson.cn> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/hamradio/mkiss.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index ba0ca85e3d76..29a83fb769d8 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -41,6 +41,8 @@
#define AX_MTU 236
+/* some arch define END as assembly function ending, just undef it */
+#undef END
/* SLIP/KISS protocol characters. */
#define END 0300 /* indicates end of frame */
#define ESC 0333 /* indicates byte stuffing */