diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /drivers/pcmcia/Kconfig | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
| download | linux-29f147d746326e4db5fe350c70373081d61a2965.tar.gz | |
Merge branch 'merge'
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 cba6c9eef28e53..61cb4b29f55c44 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -250,7 +250,7 @@ config M32R_CFC_NUM config PCMCIA_VRC4171 tristate "NEC VRC4171 Card Controllers support" - depends on VRC4171 && PCMCIA + depends on CPU_VR41XX && ISA && PCMCIA config PCMCIA_VRC4173 tristate "NEC VRC4173 CARDU support" |