Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / include / linux / pnp.h

diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 05daecec16c50455e46e14bfe4d2f34bb86c5969..ca3c88773028046f36a807741f2f6fa16b9c65fe 100644 (file)
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -22,9 +22,11 @@ struct pnp_dev;
  * Resource Management
  */
 #ifdef CONFIG_PNP
-struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int);
+struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned long type,
+                               unsigned int num);
 #else
-static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num)
+static inline struct resource *pnp_get_resource(struct pnp_dev *dev,
+                       unsigned long type, unsigned int num)
 {
        return NULL;
 }