diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 17:46:07 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 17:46:07 +0300 |
| commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
| tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /drivers/pcmcia/pxa2xx_colibri.c | |
| parent | a37933c37c14b64e81c7c9cc44a5d3f5e0c91412 (diff) | |
| parent | 136333d104bd3a62d783b0ac3d0f32ac0108c5d0 (diff) | |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'drivers/pcmcia/pxa2xx_colibri.c')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_colibri.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c index 443cb7fc872d..c6dec572a05d 100644 --- a/drivers/pcmcia/pxa2xx_colibri.c +++ b/drivers/pcmcia/pxa2xx_colibri.c @@ -116,14 +116,6 @@ colibri_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, return 0; } -static void colibri_pcmcia_socket_init(struct soc_pcmcia_socket *skt) -{ -} - -static void colibri_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) -{ -} - static struct pcmcia_low_level colibri_pcmcia_ops = { .owner = THIS_MODULE, @@ -135,9 +127,6 @@ static struct pcmcia_low_level colibri_pcmcia_ops = { .socket_state = colibri_pcmcia_socket_state, .configure_socket = colibri_pcmcia_configure_socket, - - .socket_init = colibri_pcmcia_socket_init, - .socket_suspend = colibri_pcmcia_socket_suspend, }; static struct platform_device *colibri_pcmcia_device; |