summaryrefslogtreecommitdiff
path: root/drivers/tty/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-01-13 20:56:56 +0300
committerMark Brown <broonie@kernel.org>2021-01-13 20:56:56 +0300
commitcea06d9bf0e035a549226e217022fa51b0c878e5 (patch)
treea882062da6ee7f1de90a21cc0e717073cc71cb5d /drivers/tty/Makefile
parent9c25af250214e45f6d1c21ff6239a1ffeeedf20e (diff)
parent7c53f6b671f4aba70ff15e1b05148b10d58c2837 (diff)
downloadlinux-cea06d9bf0e035a549226e217022fa51b0c878e5.tar.xz
Merge v5.11-rc3
Diffstat (limited to 'drivers/tty/Makefile')
-rw-r--r--drivers/tty/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 3c1c5a9240a7..b3ccae932660 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -2,7 +2,7 @@
obj-$(CONFIG_TTY) += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \
tty_buffer.o tty_port.o tty_mutex.o \
tty_ldsem.o tty_baudrate.o tty_jobctrl.o \
- n_null.o ttynull.o
+ n_null.o
obj-$(CONFIG_LEGACY_PTYS) += pty.o
obj-$(CONFIG_UNIX98_PTYS) += pty.o
obj-$(CONFIG_AUDIT) += tty_audit.o
@@ -25,6 +25,7 @@ obj-$(CONFIG_ISI) += isicom.o
obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
obj-$(CONFIG_NOZOMI) += nozomi.o
+obj-$(CONFIG_NULL_TTY) += ttynull.o
obj-$(CONFIG_ROCKETPORT) += rocket.o
obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
obj-$(CONFIG_PPC_EPAPR_HV_BYTECHAN) += ehv_bytechan.o