Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[net-next-2.6.git] / drivers / pnp / base.h

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 3532984a9cabb807eeb0b56d421057ed4a84bcb1..3b8b9d3cb03d6cc2f8738e67abd145ff09a4285f 100644 (file)
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res);
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
 
 void pnp_free_resources(struct pnp_dev *dev);
-int pnp_resource_type(struct resource *res);
+unsigned long pnp_resource_type(struct resource *res);
 
 struct pnp_resource {
        struct list_head list;