From: Anthony Liguori <[email protected]> Post merge into upstream, device-hotplug.c is carrying stray #includes, #defines, and whitespace changes.
Signed-off-by: Anthony Liguori <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c index 24ab506..3bdc048 100644 --- a/hw/device-hotplug.c +++ b/hw/device-hotplug.c @@ -27,14 +27,6 @@ #include "net.h" #include "block_int.h" #include "sysemu.h" -#include "pci.h" -#include "pc.h" -#include "console.h" -#include "config.h" -#include "virtio-blk.h" - -#define PCI_BASE_CLASS_STORAGE 0x01 -#define PCI_BASE_CLASS_NETWORK 0x02 int add_init_drive(const char *opts) { @@ -91,3 +83,4 @@ void destroy_bdrvs(dev_match_fn *match_fn, void *arg) } } + -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
