提交 c2059b2e 编写于 作者: D David Vrabel 提交者: Linus Torvalds

[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: NDavid Vrabel <dvrabel@arcom.com>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 788e05a6
...@@ -873,6 +873,7 @@ static int ti1250_override(struct yenta_socket *socket) ...@@ -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) ...@@ -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) ...@@ -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 */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册