diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-04-05 11:06:58 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-04-05 11:06:58 +0200 |
| commit | 9cbbd694a58bdf24def2462276514c90cab7cf80 (patch) | |
| tree | 98a504890134d34631a6a0ecbce94d3f1ecc21fc /include/uapi/linux/tty.h | |
| parent | 71d637823cac7748079a912e0373476c7cf6f985 (diff) | |
| parent | 3123109284176b1532874591f7c81f3837bbdc17 (diff) | |
Merge drm/drm-next into drm-misc-next
Let's start the 5.19 development cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/uapi/linux/tty.h')
| -rw-r--r-- | include/uapi/linux/tty.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/tty.h b/include/uapi/linux/tty.h index a58deb3061eb..9d0f06bfbac3 100644 --- a/include/uapi/linux/tty.h +++ b/include/uapi/linux/tty.h @@ -6,8 +6,6 @@ * 'tty.h' defines some structures used by tty_io.c and some defines. */ -#define NR_LDISCS 30 - /* line disciplines */ #define N_TTY 0 #define N_SLIP 1 @@ -39,5 +37,9 @@ #define N_SPEAKUP 26 /* Speakup communication with synths */ #define N_NULL 27 /* Null ldisc used for error handling */ #define N_MCTP 28 /* MCTP-over-serial */ +#define N_DEVELOPMENT 29 /* Manual out-of-tree testing */ + +/* Always the newest line discipline + 1 */ +#define NR_LDISCS 30 #endif /* _UAPI_LINUX_TTY_H */ |