From 58f57ceabd3e1e4659fb5f0b4c8495332be01395 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Thu, 7 Jul 2005 17:59:09 -0700 Subject: [PATCH] --- yaml --- r: 4376 b: refs/heads/master c: 89b39f5d8d701ddd93546b3d8edbefa5d568529d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/Kconfig | 3 ++- trunk/drivers/pcmcia/ti113x.h | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index acba7ca42f53..1183ba6f06a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bc6b68a103a6f4055890b5127ddca3a322751b0 +refs/heads/master: 89b39f5d8d701ddd93546b3d8edbefa5d568529d diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig index bb4dd2735d70..6485f75d2fb3 100644 --- a/trunk/drivers/pcmcia/Kconfig +++ b/trunk/drivers/pcmcia/Kconfig @@ -102,7 +102,8 @@ comment "PC-card bridges" config YENTA tristate "CardBus yenta-compatible bridge support" - depends on CARDBUS + depends on PCI + select CARDBUS if !EMBEDDED select PCCARD_NONSTATIC ---help--- This option enables support for CardBus host bridges. Virtually diff --git a/trunk/drivers/pcmcia/ti113x.h b/trunk/drivers/pcmcia/ti113x.h index c7ba99871aca..fbe233e19ceb 100644 --- a/trunk/drivers/pcmcia/ti113x.h +++ b/trunk/drivers/pcmcia/ti113x.h @@ -154,8 +154,6 @@ #define ENE_TEST_C9 0xc9 /* 8bit */ #define ENE_TEST_C9_TLTENABLE 0x02 -#ifdef CONFIG_CARDBUS - /* * Texas Instruments CardBus controller overrides. */ @@ -843,7 +841,5 @@ static int ti1250_override(struct yenta_socket *socket) return ti12xx_override(socket); } -#endif /* CONFIG_CARDBUS */ - #endif /* _LINUX_TI113X_H */