diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-03 21:16:28 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-03 21:16:28 +0300 |
| commit | c8efe77f23d508d62e232de612e739dbf4da4659 (patch) | |
| tree | 15311b111ffb1cd798a3dc9f45fe37bd4785c413 | |
| parent | 4aa497ca10a003153dd4b7af5f33d5f71a8f30d8 (diff) | |
| parent | 564d53b8b5909ce7a23106873aaf4c4496c3df10 (diff) | |
| download | linux-c8efe77f23d508d62e232de612e739dbf4da4659.tar.xz | |
Merge branch 'pnp'
Merge a PNP changes for 6.1-rc1:
- Drop unused pnpid32_to_pnpid() declaration from PNP code (Gaosheng
Cui).
* pnp:
PNPBIOS: remove unused pnpid32_to_pnpid() declaration
| -rw-r--r-- | drivers/pnp/pnpbios/pnpbios.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pnp/pnpbios/pnpbios.h b/drivers/pnp/pnpbios/pnpbios.h index 2ce739ff9c1a..f3302006842e 100644 --- a/drivers/pnp/pnpbios/pnpbios.h +++ b/drivers/pnp/pnpbios/pnpbios.h @@ -153,7 +153,6 @@ extern int pnpbios_dont_use_current_config; extern int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node * node); extern int pnpbios_read_resources_from_node(struct pnp_dev *dev, struct pnp_bios_node *node); extern int pnpbios_write_resources_to_node(struct pnp_dev *dev, struct pnp_bios_node *node); -extern void pnpid32_to_pnpid(u32 id, char *str); extern void pnpbios_print_status(const char * module, u16 status); extern void pnpbios_calls_init(union pnp_bios_install_struct * header); |