hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
David Vrabel 2005-10-07 14:43:22 +01:00 committed by Linus Torvalds
parent 788e05a67c
commit c2059b2e0b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pcmcia/ti113x.h
View File

@ -873,6 +873,7 @@ static int ti1250_override(struct yenta_socket *socket)
* Some fixup code to make everybody happy (TM). * Some fixup code to make everybody happy (TM).
*/ */
#ifdef CONFIG_CARDBUS
/** /**
* set/clear various test bits: * set/clear various test bits:
* Defaults to clear the bit. * 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); config_writeb(socket, ENE_TEST_C9, test_c9);
} }
static int ene_override(struct yenta_socket *socket) static int ene_override(struct yenta_socket *socket)
{ {
/* install tune_bridge() function */ /* install tune_bridge() function */
@ -935,6 +935,9 @@ static int ene_override(struct yenta_socket *socket)
return ti1250_override(socket); return ti1250_override(socket);
} }
#else
# define ene_override ti1250_override
#endif
#endif /* _LINUX_TI113X_H */ #endif /* _LINUX_TI113X_H */