diff options
| author | David Vrabel <dvrabel@cantab.net> | 2005-10-07 14:43:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:53:31 -0700 |
| commit | c2059b2e0b209a0674c21f78337bb158d3ccb22b (patch) | |
| tree | 5268d7c7dd1b3ea888850926ba860996f2dac36a | |
| parent | 788e05a67c343fa22f2ae1d3ca264e7f15c25eaf (diff) | |
| download | op-kernel-dev-c2059b2e0b209a0674c21f78337bb158d3ccb22b.zip op-kernel-dev-c2059b2e0b209a0674c21f78337bb158d3ccb22b.tar.gz | |
[PATCH] yenta: fix build if YENTA && !CARDBUS
(struct pcmcia_socket).tune_bridge only exists if CONFIG_CARDBUS is set
but building yenta_socket without CardBus is valid.
Signed-off-by: David Vrabel <dvrabel@arcom.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/pcmcia/ti113x.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h index da0b404..539b5cd 100644 --- a/drivers/pcmcia/ti113x.h +++ b/drivers/pcmcia/ti113x.h @@ -873,6 +873,7 @@ static int ti1250_override(struct yenta_socket *socket) * Some fixup code to make everybody happy (TM). */ +#ifdef CONFIG_CARDBUS /** * set/clear various test bits: * Defaults to clear the bit. @@ -927,7 +928,6 @@ static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) config_writeb(socket, ENE_TEST_C9, test_c9); } - static int ene_override(struct yenta_socket *socket) { /* install tune_bridge() function */ @@ -935,6 +935,9 @@ static int ene_override(struct yenta_socket *socket) return ti1250_override(socket); } +#else +# define ene_override ti1250_override +#endif #endif /* _LINUX_TI113X_H */ |
