Skip to content

Commit

Permalink
[PATCH] yenta: fix build if YENTA && !CARDBUS
Browse files Browse the repository at this point in the history
(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>
  • Loading branch information
David Vrabel authored and Linus Torvalds committed Oct 8, 2005
1 parent 788e05a commit c2059b2
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/pcmcia/ti113x.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -927,14 +928,16 @@ 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 */
socket->socket.tune_bridge = ene_tune_bridge;

return ti1250_override(socket);
}
#else
# define ene_override ti1250_override
#endif

#endif /* _LINUX_TI113X_H */

0 comments on commit c2059b2

Please sign in to comment.