Merge Linus master into drm-next

[cascardo/linux.git] / drivers / pnp / base.h

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index c8873b0..3151fd1 100644 (file)
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -3,7 +3,7 @@
  *     Bjorn Helgaas <bjorn.helgaas@hp.com>
  */
 
-extern spinlock_t pnp_lock;
+extern struct mutex pnp_lock;
 extern const struct attribute_group *pnp_dev_groups[];
 void *pnp_alloc(long size);