← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/pcmcia/ds.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pcmcia/ds.c
45
45
 
46
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
49
        unsigned int i;
50
50
        u32 hash;
51
51
 
784
784
 
785
785
 
786
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
789
        if (did->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID) {
790
790
                if ((!dev->has_manf_id) || (dev->manf_id != did->manf_id))
890
890
{
891
891
        struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
892
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
894
        struct pcmcia_dynid *dynid;
895
895
 
896
896
        /* match dynamic devices first */