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/slip | |
| parent | 13a5fad39a7b781c21d9528bcf52a5f5babafe99 (diff) | |
| parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
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/slip')
| -rw-r--r-- | drivers/net/slip/slip.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/slip/slip.h b/drivers/net/slip/slip.h index c420e5948522..3d7f88b330c1 100644 --- a/drivers/net/slip/slip.h +++ b/drivers/net/slip/slip.h @@ -40,6 +40,8 @@ insmod -oslip_maxdev=nnn */ #define SL_MTU 296 /* 296; I am used to 600- FvK */ +/* some arch define END as assembly function ending, just undef it */ +#undef END /* SLIP protocol characters. */ #define END 0300 /* indicates end of frame */ #define ESC 0333 /* indicates byte stuffing */ |