diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
| commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
| tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /drivers/pcmcia/sa1100_shannon.c | |
| parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
| parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/pcmcia/sa1100_shannon.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_shannon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c index c4d51867a050..7ff1b43540b8 100644 --- a/drivers/pcmcia/sa1100_shannon.c +++ b/drivers/pcmcia/sa1100_shannon.c | |||
| @@ -113,7 +113,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = { | |||
| 113 | .socket_suspend = shannon_pcmcia_socket_suspend, | 113 | .socket_suspend = shannon_pcmcia_socket_suspend, |
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | int __init pcmcia_shannon_init(struct device *dev) | 116 | int __devinit pcmcia_shannon_init(struct device *dev) |
| 117 | { | 117 | { |
| 118 | int ret = -ENODEV; | 118 | int ret = -ENODEV; |
| 119 | 119 | ||