diff options
-rw-r--r-- | drivers/pcmcia/ds.c | 6 | ||||
-rw-r--r-- | include/pcmcia/ds.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 100c4412457d..749c2a16012c 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -45,7 +45,7 @@ MODULE_LICENSE("GPL"); | |||
45 | 45 | ||
46 | static void pcmcia_check_driver(struct pcmcia_driver *p_drv) | 46 | static void pcmcia_check_driver(struct pcmcia_driver *p_drv) |
47 | { | 47 | { |
48 | struct pcmcia_device_id *did = p_drv->id_table; | 48 | const struct pcmcia_device_id *did = p_drv->id_table; |
49 | unsigned int i; | 49 | unsigned int i; |
50 | u32 hash; | 50 | u32 hash; |
51 | 51 | ||
@@ -784,7 +784,7 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam | |||
784 | 784 | ||
785 | 785 | ||
786 | static inline int pcmcia_devmatch(struct pcmcia_device *dev, | 786 | static inline int pcmcia_devmatch(struct pcmcia_device *dev, |
787 | struct pcmcia_device_id *did) | 787 | const struct pcmcia_device_id *did) |
788 | { | 788 | { |
789 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID) { | 789 | if (did->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID) { |
790 | if ((!dev->has_manf_id) || (dev->manf_id != did->manf_id)) | 790 | if ((!dev->has_manf_id) || (dev->manf_id != did->manf_id)) |
@@ -890,7 +890,7 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv) | |||
890 | { | 890 | { |
891 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); | 891 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); |
892 | struct pcmcia_driver *p_drv = to_pcmcia_drv(drv); | 892 | struct pcmcia_driver *p_drv = to_pcmcia_drv(drv); |
893 | struct pcmcia_device_id *did = p_drv->id_table; | 893 | const struct pcmcia_device_id *did = p_drv->id_table; |
894 | struct pcmcia_dynid *dynid; | 894 | struct pcmcia_dynid *dynid; |
895 | 895 | ||
896 | /* match dynamic devices first */ | 896 | /* match dynamic devices first */ |
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 3fd5064dd43a..7b82080eb02c 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -56,7 +56,7 @@ struct pcmcia_driver { | |||
56 | int (*resume) (struct pcmcia_device *dev); | 56 | int (*resume) (struct pcmcia_device *dev); |
57 | 57 | ||
58 | struct module *owner; | 58 | struct module *owner; |
59 | struct pcmcia_device_id *id_table; | 59 | const struct pcmcia_device_id *id_table; |
60 | struct device_driver drv; | 60 | struct device_driver drv; |
61 | struct pcmcia_dynids dynids; | 61 | struct pcmcia_dynids dynids; |
62 | }; | 62 | }; |