diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-14 22:22:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-14 22:22:31 +0200 |
| commit | bbb9e06d2c6435af9c62074ad7048910eeb2e7bc (patch) | |
| tree | 17d152543a602d65c749efaaaaafde24d5fec46c /include/linux/hyperv.h | |
| parent | 55c3e571d2a0aabef4f1354604443f1c415d2e85 (diff) | |
| parent | 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 (diff) | |
Merge 6.5-rc6 into usb-next
We need the USB and Thunderbolt fixes in here to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/hyperv.h')
| -rw-r--r-- | include/linux/hyperv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index bfbc37ce223b..3ac3974b3c78 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1239,9 +1239,6 @@ extern int vmbus_recvpacket_raw(struct vmbus_channel *channel, u32 *buffer_actual_len, u64 *requestid); - -extern void vmbus_ontimer(unsigned long data); - /* Base driver object */ struct hv_driver { const char *name; |