Messages in this thread Patch in this message | | | Date | Mon, 03 Oct 2005 16:19:23 +0100 | From | David Vrabel <> | Subject | [patch] yenta: fix YENTA && !CARDBUS build |
| |
Hi,
yenta_socket no longer builds if CONFIG_CARDBUS is disabled. It doesn't look like ene_tune_bridge is relevant in the !CARDBUS configuration so I've just disabled it.
David Vrabel -- David Vrabel, Design Engineer
Arcom, Clifton Road Tel: +44 (0)1223 411200 ext. 3233 Cambridge CB1 7EA, UK Web: http://www.arcom.com/
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>
Index: linux-2.6-working/drivers/pcmcia/ti113x.h =================================================================== --- linux-2.6-working.orig/drivers/pcmcia/ti113x.h 2005-10-03 14:44:14.000000000 +0100 +++ linux-2.6-working/drivers/pcmcia/ti113x.h 2005-10-03 15:05:12.000000000 +0100 @@ -899,6 +899,7 @@ {} }; +#ifdef CONFIG_CARDBUS static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) { struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket); @@ -927,7 +928,6 @@ config_writeb(socket, ENE_TEST_C9, test_c9); } - static int ene_override(struct yenta_socket *socket) { /* install tune_bridge() function */ @@ -935,6 +935,9 @@ return ti1250_override(socket); } +#else +# define ene_override ti1250_override +#endif #endif /* _LINUX_TI113X_H */ | |