---

yaml --- r: 9713 b: refs/heads/master c: c2059b2 h: refs/heads/master i: 9711: b21bdab v: v3
git-mirror · Oct 8, 2005 · 967ce49 · 967ce49
1 parent 80c31c7
commit 967ce49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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,14 +928,16 @@ 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 */
 	socket->socket.tune_bridge = ene_tune_bridge;
 
 	return ti1250_override(socket);
 }
+#else
+#  define ene_override ti1250_override
+#endif
 
 #endif /* _LINUX_TI113X_H */