diff --git a/[refs] b/[refs]
index 000011c70469..16b84dbb64fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e906f0e1c8633ed357a64e9861f1822789bee3d
+refs/heads/master: b08395e5038e3337bb85c7246a635a3be6d5a29c
diff --git a/trunk/drivers/pnp/manager.c b/trunk/drivers/pnp/manager.c
index 1adc83fdabb6..7ea9e1e28003 100644
--- a/trunk/drivers/pnp/manager.c
+++ b/trunk/drivers/pnp/manager.c
@@ -231,9 +231,6 @@ static int pnp_assign_resources(struct pnp_dev *dev, int depnum)
 	struct pnp_dma *dma;
 	int nport = 0, nmem = 0, nirq = 0, ndma = 0;
 
-	if (!pnp_can_configure(dev))
-		return -ENODEV;
-
 	dbg_pnp_show_resources(dev, "before pnp_assign_resources");
 	mutex_lock(&pnp_res_mutex);
 	pnp_clean_resource_table(dev);