← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/pcmcia/pxa2xx_mainstone.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pcmcia/pxa2xx_mainstone.c
128
128
        return ret;
129
129
}
130
130
 
131
 
static void mst_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
132
 
{
133
 
}
134
 
 
135
 
static void mst_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
136
 
{
137
 
}
138
 
 
139
131
static struct pcmcia_low_level mst_pcmcia_ops __initdata = {
140
132
        .owner                  = THIS_MODULE,
141
133
        .hw_init                = mst_pcmcia_hw_init,
142
134
        .hw_shutdown            = mst_pcmcia_hw_shutdown,
143
135
        .socket_state           = mst_pcmcia_socket_state,
144
136
        .configure_socket       = mst_pcmcia_configure_socket,
145
 
        .socket_init            = mst_pcmcia_socket_init,
146
 
        .socket_suspend         = mst_pcmcia_socket_suspend,
147
137
        .nr                     = 2,
148
138
};
149
139