diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-06 09:32:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-06 09:32:47 +0100 |
| commit | f5bced9f34355d2b12779eebdf2634cb27c18cff (patch) | |
| tree | d636906d3aeb78eecc48b6d1e5d0b44b58cd8016 /drivers/net/hamradio | |
| parent | tty: mips_ejtag_fdc: Make use of the helper function kthread_run_on_cpu() (diff) | |
| parent | Linux 5.16-rc4 (diff) | |
| download | linux-f5bced9f34355d2b12779eebdf2634cb27c18cff.tar.xz linux-f5bced9f34355d2b12779eebdf2634cb27c18cff.zip | |
Merge 5.16-rc4 into tty-next
We need the tty/serial driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/mkiss.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 894b5f92b85f..a19d6a963778 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 */ |