X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fpnp%2Fresource.c;h=dbae23acdd5b12e1df4a83164dbec01a4c6d7a54;hb=92fb83afd6664a6f8a05f990d264c998f9b99f69;hp=4cfe3a1efdfbc24a213abc838dab1631abf9f5d4;hpb=14b395e35d1afdd8019d11b92e28041fad591b71;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 4cfe3a1efdf..dbae23acdd5 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 #endif
 }
 
-int pnp_resource_type(struct resource *res)
+unsigned long pnp_resource_type(struct resource *res)
 {
 	return res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
 			     IORESOURCE_IRQ | IORESOURCE_DMA);
 }
 
 struct resource *pnp_get_resource(struct pnp_dev *dev,
-				  unsigned int type, unsigned int num)
+				  unsigned long type, unsigned int num)
 {
 	struct pnp_resource *pnp_res;
 	struct resource *res;