summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-01-08 01:01:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:13:37 -0800
commit7a758313905f8b085b4591e8838626274e88b969 (patch)
tree168dec8dfc40a5c01fe2d9ad3920e1f7f6238fee /arch
parenta2a88f88782e8815cafa22f2b9e22234b9a61d0a (diff)
downloadop-kernel-dev-7a758313905f8b085b4591e8838626274e88b969.zip
op-kernel-dev-7a758313905f8b085b4591e8838626274e88b969.tar.gz
[PATCH] frv: fix PCMCIA configuration
Fix PCMCIA configuration for FRV by including the stock PCMCIA configuration description file. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/frv/Kconfig18
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index ec85c0d..3516a3a 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -305,23 +305,7 @@ config RESERVE_DMA_COHERENT
source "drivers/pci/Kconfig"
-config PCMCIA
- tristate "Use PCMCIA"
- help
- Say Y here if you want to attach PCMCIA- or PC-cards to your FR-V
- board. These are credit-card size devices such as network cards,
- modems or hard drives often used with laptops computers. There are
- actually two varieties of these cards: the older 16 bit PCMCIA cards
- and the newer 32 bit CardBus cards. If you want to use CardBus
- cards, you need to say Y here and also to "CardBus support" below.
-
- To use your PC-cards, you will need supporting software from David
- Hinds pcmcia-cs package (see the file <file:Documentation/Changes>
- for location). Please also read the PCMCIA-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as modules, choose M here: the
- modules will be called pcmcia_core and ds.
+source "drivers/pcmcia/Kconfig"
#config MATH_EMULATION
# bool "Math emulation support (EXPERIMENTAL)"
OpenPOWER on IntegriCloud