diff --git a/[refs] b/[refs]
index b3ed3d873e58..e651a1a664f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49f276be7ce12d90b6941a000b09e61b68e6c4f2
+refs/heads/master: ef3d7714f6b75b51825ad0384b5ce48358427e50
diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h
index 1ce54b63085d..be764e514e35 100644
--- a/trunk/include/linux/pnp.h
+++ b/trunk/include/linux/pnp.h
@@ -21,7 +21,14 @@ struct pnp_dev;
 /*
  * Resource Management
  */
+#ifdef CONFIG_PNP
 struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int);
+#else
+static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num)
+{
+	return NULL;
+}
+#endif
 
 static inline int pnp_resource_valid(struct resource *res)
 {