diff options
author | Jiri Kosina | 2010-05-03 15:25:35 +0200 |
---|---|---|
committer | Jiri Kosina | 2010-05-03 15:25:35 +0200 |
commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/virtio | |
parent | HID: split picolcd's operation_mode sysfs attribute (diff) | |
parent | HID: add suspend/resume hooks for hid drivers (diff) | |
download | kernel-qcow2-linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.gz kernel-qcow2-linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz kernel-qcow2-linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/virtio')
-rw-r--r-- | drivers/virtio/virtio_balloon.c | 1 | ||||
-rw-r--r-- | drivers/virtio/virtio_pci.c | 1 | ||||
-rw-r--r-- | drivers/virtio/virtio_ring.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 369f2eebbad1..3aed38886f94 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -24,6 +24,7 @@ #include <linux/kthread.h> #include <linux/freezer.h> #include <linux/delay.h> +#include <linux/slab.h> struct virtio_balloon { diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 625447f645d9..24747aef1952 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/virtio.h> #include <linux/virtio_config.h> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 0db906b3c95d..0f90634bcb85 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -20,6 +20,7 @@ #include <linux/virtio_ring.h> #include <linux/virtio_config.h> #include <linux/device.h> +#include <linux/slab.h> /* virtio guest is communicating with a virtual "device" that actually runs on * a host processor. Memory barriers are used to control SMP effects. */ |