diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-10-03 10:05:55 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-10-03 10:05:55 -0700 |
commit | f66ebf37d69cc700ca884c6a18c2258caf8b151b (patch) | |
tree | 9971d3c37e198dc9474184427fe5bb7408bb8bf5 /drivers/isdn/mISDN/timerdev.c | |
parent | c30a3f54e661d01df2bf193398336155089dd502 (diff) | |
parent | 8c245fe7dde3bf776253550fc914a36293db4ff3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts and no adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/isdn/mISDN/timerdev.c')
-rw-r--r-- | drivers/isdn/mISDN/timerdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c index 83d6b484d3c6..7cfa8c61dba0 100644 --- a/drivers/isdn/mISDN/timerdev.c +++ b/drivers/isdn/mISDN/timerdev.c @@ -266,7 +266,6 @@ static const struct file_operations mISDN_fops = { .unlocked_ioctl = mISDN_ioctl, .open = mISDN_open, .release = mISDN_close, - .llseek = no_llseek, }; static struct miscdevice mISDNtimer = { |