diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/pcmcia/Kconfig | |
parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r-- | drivers/pcmcia/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index ddc741e6ecbf..36cc9a96a338 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
@@ -146,7 +146,7 @@ config I82365 | |||
146 | 146 | ||
147 | config TCIC | 147 | config TCIC |
148 | tristate "Databook TCIC host bridge support" | 148 | tristate "Databook TCIC host bridge support" |
149 | depends on PCMCIA | 149 | depends on PCMCIA && ISA |
150 | select PCCARD_NONSTATIC | 150 | select PCCARD_NONSTATIC |
151 | help | 151 | help |
152 | Say Y here to include support for the Databook TCIC family of PCMCIA | 152 | Say Y here to include support for the Databook TCIC family of PCMCIA |