diff --git a/[refs] b/[refs]
index 918e6a638103..5b97fa024fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87e4acf3ebc02c9d0a2f7a37b655c49176c4d765
+refs/heads/master: 940e98dbc616f1df7b63b73858a966969baf261d
diff --git a/trunk/drivers/pnp/base.h b/trunk/drivers/pnp/base.h
index 6f60097c4212..4c2a62564994 100644
--- a/trunk/drivers/pnp/base.h
+++ b/trunk/drivers/pnp/base.h
@@ -46,6 +46,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res);
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
 
 void pnp_init_resource(struct resource *res);
+int pnp_resource_type(struct resource *res);
 
 struct pnp_resource *pnp_get_pnp_resource(struct pnp_dev *dev,
 					  unsigned int type, unsigned int num);
diff --git a/trunk/drivers/pnp/resource.c b/trunk/drivers/pnp/resource.c
index 390b50096e30..cce341f743d4 100644
--- a/trunk/drivers/pnp/resource.c
+++ b/trunk/drivers/pnp/resource.c
@@ -499,6 +499,12 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 #endif
 }
 
+int pnp_resource_type(struct resource *res)
+{
+	return res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
+			     IORESOURCE_IRQ | IORESOURCE_DMA);
+}
+
 struct pnp_resource *pnp_get_pnp_resource(struct pnp_dev *dev,
 					  unsigned int type, unsigned int num)
 {