diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 04:12:51 -0500 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /drivers/net/pcmcia/ibmtr_cs.c | |
| parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
| parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index cf3cca4642f2..f51944b28cfa 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
| @@ -349,7 +349,7 @@ static int ibmtr_suspend(struct pcmcia_device *link) | |||
| 349 | return 0; | 349 | return 0; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | static int ibmtr_resume(struct pcmcia_device *link) | 352 | static int __devinit ibmtr_resume(struct pcmcia_device *link) |
| 353 | { | 353 | { |
| 354 | ibmtr_dev_t *info = link->priv; | 354 | ibmtr_dev_t *info = link->priv; |
| 355 | struct net_device *dev = info->dev; | 355 | struct net_device *dev = info->dev; |