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

bad -> good

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     |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/pnp/interface.c~isapnp-driver-semaphore-to-mutex-fix drivers/pnp/interface.c
--- a/drivers/pnp/interface.c~isapnp-driver-semaphore-to-mutex-fix
+++ a/drivers/pnp/interface.c
@@ -316,8 +316,6 @@ static ssize_t pnp_show_current_resource
 	return ret;
 }
 
-extern struct mutex pnp_res_mutex;
-
 static ssize_t
 pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
 			  const char *ubuf, size_t count)
diff -puN include/linux/pnp.h~isapnp-driver-semaphore-to-mutex-fix include/linux/pnp.h
--- a/include/linux/pnp.h~isapnp-driver-semaphore-to-mutex-fix
+++ a/include/linux/pnp.h
@@ -254,6 +254,7 @@ 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
_