summaryrefslogtreecommitdiffstats
path: root/drivers/virtio/config.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2016-11-14 08:11:29 +0100
committerGreg Kroah-Hartman2016-11-14 08:11:29 +0100
commit8a0a8e1c42fdf656e7b729e9c468c2caa687adb7 (patch)
treebde58e16dd5e6912deccac7e41b9a95f05187ea6 /drivers/virtio/config.c
parentUSB: cdc-acm: use get_icount tty operation (diff)
parentLinux 4.9-rc5 (diff)
downloadkernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.gz
kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.xz
kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.zip
Merge 4.9-rc5 into usb-next
We want/need the USB fixes in here as well, for testing and merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/virtio/config.c')
-rw-r--r--drivers/virtio/config.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/virtio/config.c b/drivers/virtio/config.c
deleted file mode 100644
index f70bcd2ff98f..000000000000
--- a/drivers/virtio/config.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Configuration space parsing helpers for virtio.
- *
- * The configuration is [type][len][... len bytes ...] fields.
- *
- * Copyright 2007 Rusty Russell, IBM Corporation.
- * GPL v2 or later.
- */
-#include <linux/err.h>
-#include <linux/virtio.h>
-#include <linux/virtio_config.h>
-#include <linux/bug.h>
-