Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
David Vrabel
and committed by
Linus Torvalds
c2059b2e
788e05a6
+4
-1
+4
-1
drivers/pcmcia/ti113x.h
+4
-1
drivers/pcmcia/ti113x.h
···
873
873
* Some fixup code to make everybody happy (TM).
874
874
*/
875
875
876
+
#ifdef CONFIG_CARDBUS
876
877
/**
877
878
* set/clear various test bits:
878
879
* Defaults to clear the bit.
···
928
927
config_writeb(socket, ENE_TEST_C9, test_c9);
929
928
}
930
929
931
-
932
930
static int ene_override(struct yenta_socket *socket)
933
931
{
934
932
/* install tune_bridge() function */
···
935
935
936
936
return ti1250_override(socket);
937
937
}
938
+
#else
939
+
# define ene_override ti1250_override
940
+
#endif
938
941
939
942
#endif /* _LINUX_TI113X_H */
940
943