Commit c8efe77f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 4aa497ca 564d53b8

drivers/pnp/pnpbios/pnpbios.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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_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_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 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_print_status(const char * module, u16 status);

extern void pnpbios_calls_init(union pnp_bios_install_struct * header);

extern void pnpbios_calls_init(union pnp_bios_install_struct * header);