diff options
| author | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:19 +0900 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:33 +0900 |
| commit | fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d (patch) | |
| tree | d417b1a0b9db925fc791393bdfeee2099ef32028 /drivers/tty/n_null.c | |
| parent | Linux 5.12-rc3 (diff) | |
| parent | dt-bindings: serial: samsung: add DMA properties (diff) | |
| download | linux-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.tar.gz linux-fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d.zip | |
Merge commit '71b25f4df984' from tty/tty-next
This point in gregkh's tty-next tree includes all the samsung_tty
changes that were part of v3 of the M1 bring-up series, and have
already been merged in.
Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'drivers/tty/n_null.c')
| -rw-r--r-- | drivers/tty/n_null.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/n_null.c b/drivers/tty/n_null.c index ce03ae78f5c6..b8f67b5f1ef8 100644 --- a/drivers/tty/n_null.c +++ b/drivers/tty/n_null.c @@ -40,7 +40,6 @@ static void n_null_receivebuf(struct tty_struct *tty, static struct tty_ldisc_ops null_ldisc = { .owner = THIS_MODULE, - .magic = TTY_LDISC_MAGIC, .name = "n_null", .open = n_null_open, .close = n_null_close, |