diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-13 00:36:15 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-13 00:36:15 +0200 |
commit | 17528b31c5e2b2d40bb52954af88849303ebb915 (patch) | |
tree | 70ca684e33a6579d12d5a887c86bfd3f74894e14 /drivers/pnp/base.h | |
parent | 9a9ca16e7a36a9daa93f6d2cf912170091d91ed6 (diff) | |
parent | 71150d226564686ef32d15d29edfd18346f6e929 (diff) | |
download | op-kernel-dev-17528b31c5e2b2d40bb52954af88849303ebb915.zip op-kernel-dev-17528b31c5e2b2d40bb52954af88849303ebb915.tar.gz |
Merge branch 'pnp'
* pnp:
PNP: Avoid leaving unregistered device objects in lists
PNP: Convert pnp_lock into a mutex
PNP: tty/serial/8250/8250_fintek: Use module_pnp_driver to register driver
PNP: platform/x86/apple-gmux: Use module_pnp_driver to register driver
PNP: net/sb1000: Use module_pnp_driver to register driver
PNP: media/rc: Use module_pnp_driver to register driver
PNP: ide/ide-pnp: Use module_pnp_driver to register driver
PNP: ata/pata_isapnp: Use module_pnp_driver to register driver
PNP: tpm/tpm_infineon: Use module_pnp_driver to register driver
PNP: Add helper macro for pnp_register_driver boilerplate
PNP / ACPI: Use ACPI_COMPANION_SET() during initialization
Diffstat (limited to 'drivers/pnp/base.h')
-rw-r--r-- | drivers/pnp/base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h index c8873b0..3151fd1 100644 --- 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); |