From: David Howells Date: Sun, 8 Jan 2006 09:01:22 +0000 (-0800) Subject: [PATCH] frv: fix PCMCIA configuration X-Git-Tag: v2.6.16-rc1~857 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a758313905f8b085b4591e8838626274e88b969;p=linux-2.6 [PATCH] frv: fix PCMCIA configuration Fix PCMCIA configuration for FRV by including the stock PCMCIA configuration description file. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index ec85c0d6c6..3516a3aee8 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 - for location). Please also read the PCMCIA-HOWTO, available from - . - - 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)"