diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-28 01:28:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 03:03:20 +0200 |
| commit | 33519ddd43f4adc221ee7b2801dedd19ac97540b (patch) | |
| tree | f80b15281279ff58fcfce01f15d32153cd825ec1 /drivers/pcmcia/pcmcia_ioctl.c | |
| parent | [PATCH] pcmcia: move pcmcia resource handling out of cs.c (diff) | |
| download | linux-33519ddd43f4adc221ee7b2801dedd19ac97540b.tar.xz linux-33519ddd43f4adc221ee7b2801dedd19ac97540b.zip | |
[PATCH] pcmcia: cs.c cleanup
Clean up cs.c
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
| -rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 7aa2e7f20d50..fa2a79d29e16 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c @@ -275,8 +275,16 @@ rescan: return (ret); } /* bind_request */ +#ifdef CONFIG_CARDBUS + +static struct pci_bus *pcmcia_lookup_bus(struct pcmcia_socket *s) +{ + if (!s || !(s->state & SOCKET_CARDBUS)) + return NULL; -extern struct pci_bus *pcmcia_lookup_bus(struct pcmcia_socket *s); + return s->cb_dev->subordinate; +} +#endif static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int first) { |