1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index bdb44f2473e8..c01b5ddce529 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
+#include <xen/platform_pci.h>
 #include <xen/grant_table.h>
 #include <xen/xenbus.h>
 #include <xen/events.h>
@@ -195,6 +196,11 @@ static struct pci_driver platform_driver = {
 
 static int __init platform_pci_module_init(void)
 {
+        /* no unplug has been done, IGNORE hasn't been specified: just
+         * return now */
+        if (!xen_platform_pci_unplug)
+                return -ENODEV;
+
         return pci_register_driver(&platform_driver);
 }