From 967ce495f6241415a487adcc0fd2d82669defaa8 Mon Sep 17 00:00:00 2001
From: David Vrabel <dvrabel@cantab.net>
Date: Fri, 7 Oct 2005 14:43:22 +0100
Subject: [PATCH] --- yaml --- r: 9713 b: refs/heads/master c:
 c2059b2e0b209a0674c21f78337bb158d3ccb22b h: refs/heads/master i:   9711:
 b21bdab6f4b8dd5cd1f1acf0bcdaa971e4026305 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pcmcia/ti113x.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a19ab0ba504d..41bc8a764d59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 788e05a67c343fa22f2ae1d3ca264e7f15c25eaf
+refs/heads/master: c2059b2e0b209a0674c21f78337bb158d3ccb22b
diff --git a/trunk/drivers/pcmcia/ti113x.h b/trunk/drivers/pcmcia/ti113x.h
index da0b404561c9..539b5cd1a598 100644
--- a/trunk/drivers/pcmcia/ti113x.h
+++ b/trunk/drivers/pcmcia/ti113x.h
@@ -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.
@@ -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);
 }
 
-
 static int ene_override(struct yenta_socket *socket)
 {
 	/* install tune_bridge() function */
@@ -935,6 +935,9 @@ static int ene_override(struct yenta_socket *socket)
 
 	return ti1250_override(socket);
 }
+#else
+#  define ene_override ti1250_override
+#endif
 
 #endif /* _LINUX_TI113X_H */