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/watchdog/sbc_epx_c3.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/watchdog/sbc_epx_c3.c')
-rw-r--r-- | drivers/watchdog/sbc_epx_c3.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 5e3a9ddb952e..1d291dc0a4a6 100644 --- a/drivers/watchdog/sbc_epx_c3.c +++ b/drivers/watchdog/sbc_epx_c3.c @@ -153,7 +153,6 @@ static int epx_c3_notify_sys(struct notifier_block *this, unsigned long code, static const struct file_operations epx_c3_fops = { .owner = THIS_MODULE, - .llseek = no_llseek, .write = epx_c3_write, .unlocked_ioctl = epx_c3_ioctl, .compat_ioctl = compat_ptr_ioctl, |