From: Andrew Morton <akpm@linux-foundation.org>

drivers/pnp/interface.c: In function 'pnp_set_current_resources':
drivers/pnp/interface.c:363: error: 'pnp_res_mutex' undeclared (first use in this function)
drivers/pnp/interface.c:363: error: (Each undeclared identifier is reported only once
drivers/pnp/interface.c:363: error: for each function it appears in.)

Strange that an isapnp semaphore is needed with CONFIG_ISAPNP=n.

Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Daniel Walker <dwalker@mvista.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pnp/interface.c |    2 ++
 include/linux/pnp.h     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff -puN drivers/pnp/interface.c~isapnp-driver-semaphore-to-mutex-fix-fix drivers/pnp/interface.c
--- a/drivers/pnp/interface.c~isapnp-driver-semaphore-to-mutex-fix-fix
+++ a/drivers/pnp/interface.c
@@ -10,10 +10,12 @@
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/pnp.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+
 #include <asm/uaccess.h>
 
 #include "base.h"
diff -puN include/linux/pnp.h~isapnp-driver-semaphore-to-mutex-fix-fix include/linux/pnp.h
--- a/include/linux/pnp.h~isapnp-driver-semaphore-to-mutex-fix-fix
+++ a/include/linux/pnp.h
@@ -254,11 +254,11 @@ struct pnp_fixup {
 
 #ifdef CONFIG_ISAPNP
 extern struct pnp_protocol isapnp_protocol;
-extern struct mutex pnp_res_mutex;
 #define pnp_device_is_isapnp(dev) ((dev)->protocol == (&isapnp_protocol))
 #else
 #define pnp_device_is_isapnp(dev) 0
 #endif
+extern struct mutex pnp_res_mutex;
 
 #ifdef CONFIG_PNPBIOS
 extern struct pnp_protocol pnpbios_protocol;
_