diff options
| author | Wolfram Sang <[email protected]> | 2023-08-14 16:54:36 +0200 |
|---|---|---|
| committer | Wolfram Sang <[email protected]> | 2023-08-14 16:54:36 +0200 |
| commit | 60c089b2e2c1c744de032c5b075f9349ae2d95c8 (patch) | |
| tree | 70a97322adb124ddf31fb29337d3d3ac59de7c49 /include/linux | |
| parent | 3253f6923a7825e301e05130afede82dde62acc9 (diff) | |
| parent | 7a34bab2daeaae6d2f32bdfa20b876a8f210cd7a (diff) | |
Merge remote-tracking branch 'andi/i2c/andi-for-next' into i2c/for-mergewindow
Pull the patches Andi kindly collected while I was on hiatus. Thanks,
Andi!
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/virtio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/virtio.h b/include/linux/virtio.h index de6041deee37..7ed071b5ef07 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -184,10 +184,8 @@ struct virtio_driver { void (*scan)(struct virtio_device *dev); void (*remove)(struct virtio_device *dev); void (*config_changed)(struct virtio_device *dev); -#ifdef CONFIG_PM int (*freeze)(struct virtio_device *dev); int (*restore)(struct virtio_device *dev); -#endif }; static inline struct virtio_driver *drv_to_virtio(struct device_driver *drv) |