summaryrefslogtreecommitdiff
path: root/drivers
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:09:39 +0100
commitdbbe09d953773e89d7e9bfb49acd936ddf7d84db (patch)
treeffcdf25da4c811fe4c96b68bac96fd2e0e7f8eda /drivers
parentdcd03efd7e8dee7a2f69bede085627fb82a9a94d (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>
Diffstat (limited to 'drivers')
-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 63502a85a975..049264a7d961 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -31,6 +31,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 */