diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 19:00:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 19:00:15 +0100 |
| commit | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (patch) | |
| tree | 4aa5c06a58da4295a6053fb950e883fb33db82ae /drivers/pcmcia/sa1100_h3600.c | |
| parent | Revert "8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang" (diff) | |
| parent | drivers/pcmcia/soc_common.c: Use printf extension %pV (diff) | |
| download | linux-0143832cc96d0bf78486297aad5c8fb2c2ead02a.tar.xz linux-0143832cc96d0bf78486297aad5c8fb2c2ead02a.zip | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
drivers/pcmcia/soc_common.c: Use printf extension %pV
pcmcia: fix warning in synclink driver
pcmcia/sa1100: don't put machine specific init functions in .init.text
pcmcia/cm4000: fix error code
pd6729: Coding Style fixes
Diffstat (limited to 'drivers/pcmcia/sa1100_h3600.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_h3600.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index 56329ad575a9..edf8f0028898 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c @@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = { .socket_suspend = h3600_pcmcia_socket_suspend, }; -int __init pcmcia_h3600_init(struct device *dev) +int __devinit pcmcia_h3600_init(struct device *dev) { int ret = -ENODEV; |