diff --git a/[refs] b/[refs] index c9bcb9e6c726..d3bf6e5e4fa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e5d17ebe41eb98a538ef13aad36da5136701aab +refs/heads/master: 81000808b636b75a0ff5ef86c28f24fc6f5151eb diff --git a/trunk/drivers/pcmcia/Kconfig b/trunk/drivers/pcmcia/Kconfig index ddc741e6ecbf..36cc9a96a338 100644 --- a/trunk/drivers/pcmcia/Kconfig +++ b/trunk/drivers/pcmcia/Kconfig @@ -146,7 +146,7 @@ config I82365 config TCIC tristate "Databook TCIC host bridge support" - depends on PCMCIA + depends on PCMCIA && ISA select PCCARD_NONSTATIC help Say Y here to include support for the Databook TCIC family of PCMCIA