diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-14 11:50:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-14 11:50:01 -0700 |
| commit | defb53a7c790f9e37a765de8a5d830ed15e2055b (patch) | |
| tree | af21162a303cb194bf041aae9c65519e8feb4423 /drivers/acpi | |
| parent | cf1d2b44f6c701ffff58606b5b8a8996190d6e7d (diff) | |
| parent | 2ef0342530b0f487a65b5f6c94c85dce5f9b53b5 (diff) | |
| download | linux-defb53a7c790f9e37a765de8a5d830ed15e2055b.tar.gz linux-defb53a7c790f9e37a765de8a5d830ed15e2055b.tar.bz2 linux-defb53a7c790f9e37a765de8a5d830ed15e2055b.zip | |
Merge tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull PNP updates from Rafael Wysocki:
"These clean the PNP code somewhat:
- Remove the now unused pnp_find_card() function (Christoph Hellwig)
- Drop duplicate pci.h include from the quirks code and add an
"internal.h" include to acpi_pnp.c to fix a compiler warning (Tian
Tao)"
* tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PNP: remove the now unused pnp_find_card() function
PNP: ACPI: Fix missing-prototypes in acpi_pnp.c
PNP: quirks: Fix duplicate included pci.h
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpi_pnp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c index f3039b93ff61..4ed755a963aa 100644 --- a/drivers/acpi/acpi_pnp.c +++ b/drivers/acpi/acpi_pnp.c @@ -11,6 +11,8 @@ #include <linux/module.h> #include <linux/ctype.h> +#include "internal.h" + static const struct acpi_device_id acpi_pnp_device_ids[] = { /* pata_isapnp */ {"PNP0600"}, /* Generic ESDI/IDE/ATA compatible hard disk controller */ |