Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / drivers / net / xen-netfront.c

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index b16175032327c3e0d6fd02fa8e3e0c96e6dd265a..663b32c2e93185f60b391b2706cbc847e4c8ffd2 100644 (file)
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -47,6 +47,7 @@
 #include <xen/xenbus.h>
 #include <xen/events.h>
 #include <xen/page.h>
+#include <xen/platform_pci.h>
 #include <xen/grant_table.h>
 
 #include <xen/interface/io/netif.h>
@@ -1964,6 +1965,9 @@ static int __init netif_init(void)
        if (xen_initial_domain())
                return 0;
 
+       if (!xen_platform_pci_unplug)
+               return -ENODEV;
+
        printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
 
        return xenbus_register_frontend(&netfront_driver);