summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/pnp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index b97e8f64122f..d138647ff235 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -189,7 +189,7 @@ struct pnp_device_id {
unsigned long driver_data; /* data private to the driver */
};
-struct pnp_card_id {
+struct pnp_card_device_id {
char id[7];
unsigned long driver_data; /* data private to the driver */
struct {
@@ -216,9 +216,9 @@ struct pnp_driver {
struct pnpc_driver {
struct list_head node;
char *name;
- const struct pnp_card_id *id_table;
+ const struct pnp_card_device_id *id_table;
unsigned int flags;
- int (*probe) (struct pnp_card *card, const struct pnp_card_id *card_id);
+ int (*probe) (struct pnp_card *card, const struct pnp_card_device_id *card_id);
void (*remove) (struct pnp_card *card);
struct device_driver driver;
};