diff options
-rw-r--r-- | drivers/pnp/base.h | 1 | ||||
-rw-r--r-- | include/linux/pnp.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h index ff435bd1ca18..b492569bcdf4 100644 --- a/drivers/pnp/base.h +++ b/drivers/pnp/base.h | |||
@@ -4,6 +4,7 @@ void *pnp_alloc(long size); | |||
4 | void pnp_eisa_id_to_string(u32 id, char *str); | 4 | void pnp_eisa_id_to_string(u32 id, char *str); |
5 | struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid); | 5 | struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid); |
6 | struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id); | 6 | struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id); |
7 | int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card); | ||
7 | int pnp_interface_attach_device(struct pnp_dev *dev); | 8 | int pnp_interface_attach_device(struct pnp_dev *dev); |
8 | void pnp_fixup_device(struct pnp_dev *dev); | 9 | void pnp_fixup_device(struct pnp_dev *dev); |
9 | void pnp_free_option(struct pnp_option *option); | 10 | void pnp_free_option(struct pnp_option *option); |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 9a05ab5515b6..7639db83ce3f 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -371,7 +371,6 @@ int pnp_add_card(struct pnp_card *card); | |||
371 | void pnp_remove_card(struct pnp_card *card); | 371 | void pnp_remove_card(struct pnp_card *card); |
372 | int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev); | 372 | int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev); |
373 | void pnp_remove_card_device(struct pnp_dev *dev); | 373 | void pnp_remove_card_device(struct pnp_dev *dev); |
374 | int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card); | ||
375 | struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, | 374 | struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, |
376 | const char *id, struct pnp_dev *from); | 375 | const char *id, struct pnp_dev *from); |
377 | void pnp_release_card_device(struct pnp_dev *dev); | 376 | void pnp_release_card_device(struct pnp_dev *dev); |
@@ -423,7 +422,6 @@ static inline int pnp_add_card(struct pnp_card *card) { return -ENODEV; } | |||
423 | static inline void pnp_remove_card(struct pnp_card *card) { } | 422 | static inline void pnp_remove_card(struct pnp_card *card) { } |
424 | static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; } | 423 | static inline int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev) { return -ENODEV; } |
425 | static inline void pnp_remove_card_device(struct pnp_dev *dev) { } | 424 | static inline void pnp_remove_card_device(struct pnp_dev *dev) { } |
426 | static inline int pnp_add_card_id(struct pnp_id *id, struct pnp_card *card) { return -ENODEV; } | ||
427 | static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; } | 425 | static inline struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, const char *id, struct pnp_dev *from) { return NULL; } |
428 | static inline void pnp_release_card_device(struct pnp_dev *dev) { } | 426 | static inline void pnp_release_card_device(struct pnp_dev *dev) { } |
429 | static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; } | 427 | static inline int pnp_register_card_driver(struct pnp_card_driver *drv) { return -ENODEV; } |