diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-26 15:11:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-26 15:11:20 -0700 |
| commit | 6f063aea557f66eea8c35034a25df85cae5ced33 (patch) | |
| tree | 326fefee4ba268d27e7b686a4af4e7a35b008428 /include | |
| parent | f3845f3f6081b97ebc4dc905e097c07e868017b5 (diff) | |
| parent | d7646f7632549124fe70fec8af834c7c1246f365 (diff) | |
| download | linux-0-day-6f063aea557f66eea8c35034a25df85cae5ced33.tar.gz linux-0-day-6f063aea557f66eea8c35034a25df85cae5ced33.tar.xz | |
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:
pcmcia: use dev_pm_ops for class pcmcia_socket_class
power: support _noirq actions on device types and classes
pcmcia: allow for four multifunction subdevices (again)
pcmcia: do not use ioports < 0x100 on x86
pd6729: Coding Style fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcmcia/ss.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 32896a7739105..2e488b60bc760 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -277,12 +277,6 @@ extern struct pccard_resource_ops pccard_nonstatic_ops; #endif -/* socket drivers are expected to use these callbacks in their .drv struct */ -extern int pcmcia_socket_dev_suspend(struct device *dev); -extern void pcmcia_socket_dev_early_resume(struct device *dev); -extern void pcmcia_socket_dev_late_resume(struct device *dev); -extern int pcmcia_socket_dev_resume(struct device *dev); - /* socket drivers use this callback in their IRQ handler */ extern void pcmcia_parse_events(struct pcmcia_socket *socket, unsigned int events); |