Merge branch 'for-3.4'

[~andy/linux] / drivers / xen / platform-pci.c

diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 319dd0a94d5135389ff7f932ef68872f0936f5e0..2389e581e23c00c21982e97658c87fe5200689a0 100644 (file)
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -186,11 +186,6 @@ 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);
 }