diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-14 21:50:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-14 21:50:01 +0300 |
| commit | defb53a7c790f9e37a765de8a5d830ed15e2055b (patch) | |
| tree | af21162a303cb194bf041aae9c65519e8feb4423 /Documentation/admin-guide | |
| parent | cf1d2b44f6c701ffff58606b5b8a8996190d6e7d (diff) | |
| parent | 2ef0342530b0f487a65b5f6c94c85dce5f9b53b5 (diff) | |
| download | linux-defb53a7c790f9e37a765de8a5d830ed15e2055b.tar.xz | |
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 'Documentation/admin-guide')
| -rw-r--r-- | Documentation/admin-guide/pnp.rst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/admin-guide/pnp.rst b/Documentation/admin-guide/pnp.rst index bab2d10631f0..3eda08191d13 100644 --- a/Documentation/admin-guide/pnp.rst +++ b/Documentation/admin-guide/pnp.rst @@ -281,10 +281,6 @@ ISAPNP drivers. They should serve as a temporary solution only. They are as follows:: - struct pnp_card *pnp_find_card(unsigned short vendor, - unsigned short device, - struct pnp_card *from) - struct pnp_dev *pnp_find_dev(struct pnp_card *card, unsigned short vendor, unsigned short function, |