aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2022-06-27 17:00:38 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2022-06-27 17:00:38 +0200
commit9f0109685f075880283934b274ad6f2ef313c21e (patch)
tree322df78d0268ddbb6d3bcc3a3f60f687de099cec /include/uapi/linux
parentipmr: fix a lockdep splat in ipmr_rtm_dumplink() (diff)
parentcan: can327: CAN/ldisc driver for ELM327 based OBD-II adapters (diff)
downloadlinux-dev-9f0109685f075880283934b274ad6f2ef313c21e.tar.xz
linux-dev-9f0109685f075880283934b274ad6f2ef313c21e.zip
Merge branch 'can327-CAN-ldisc-driver-for-ELM327-based-OBD-II-adapters'
Max Staudt says: ==================== This is the can327 driver. It does a surprisingly good job at turning ELM327 based OBD-II interfaces into cheap CAN interfaces for simple homebrew projects. Please see the included documentation for details and limitations: Documentation/networking/device_drivers/can/can327.rst ==================== Link: https://lore.kernel.org/all/20220618195031.10975-1-max@enpas.org/ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/tty.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/tty.h b/include/uapi/linux/tty.h
index 9d0f06bfbac3..68aeae2addec 100644
--- a/include/uapi/linux/tty.h
+++ b/include/uapi/linux/tty.h
@@ -38,8 +38,9 @@
#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 */
+#define N_CAN327 30 /* ELM327 based OBD-II interfaces */
/* Always the newest line discipline + 1 */
-#define NR_LDISCS 30
+#define NR_LDISCS 31
#endif /* _UAPI_LINUX_TTY_H */