diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-24 00:50:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 12:17:01 -0500 |
commit | c6afec5e4d323e7b88a7d6e291a5aa021a8fcb7d (patch) | |
tree | 874181100e9595b1f75b10bbf4e60f6352e422d2 /arch/sparc/Kconfig | |
parent | 2c2551ab99f9ba3c726e6a41c84ef0c7390fc546 (diff) |
sparc: Include drivers/pcmcia/Kconfig
Stephen Rothwell pointed out that pcmcia can't be enabled on sparc64.
There is an empty non-prompt PCMCIA explicit entry in
arch/sparc/Kconfig but that doesn't do anything.
32-bit sparc needs a small hack to make this work, since it doesn't
use the generic IRQ layer yes. We have to provide a dummy definition
of probe_irq_mask(), since this is used by the yenta socket driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 41c4cd2c81bd..10945c344304 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -435,24 +435,6 @@ config MCA | |||
435 | help | 435 | help |
436 | MCA is not supported. | 436 | MCA is not supported. |
437 | 437 | ||
438 | config PCMCIA | ||
439 | tristate | ||
440 | ---help--- | ||
441 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux | ||
442 | computer. These are credit-card size devices such as network cards, | ||
443 | modems or hard drives often used with laptops computers. There are | ||
444 | actually two varieties of these cards: the older 16 bit PCMCIA cards | ||
445 | and the newer 32 bit CardBus cards. If you want to use CardBus | ||
446 | cards, you need to say Y here and also to "CardBus support" below. | ||
447 | |||
448 | To use your PC-cards, you will need supporting software from David | ||
449 | Hinds' pcmcia-cs package (see the file <file:Documentation/Changes> | ||
450 | for location). Please also read the PCMCIA-HOWTO, available from | ||
451 | <http://www.tldp.org/docs.html#howto>. | ||
452 | |||
453 | To compile this driver as modules, choose M here: the | ||
454 | modules will be called pcmcia_core and ds. | ||
455 | |||
456 | config SBUS | 438 | config SBUS |
457 | bool | 439 | bool |
458 | default y | 440 | default y |
@@ -497,6 +479,8 @@ config PCI_SYSCALL | |||
497 | 479 | ||
498 | source "drivers/pci/Kconfig" | 480 | source "drivers/pci/Kconfig" |
499 | 481 | ||
482 | source "drivers/pcmcia/Kconfig" | ||
483 | |||
500 | config SUN_OPENPROMFS | 484 | config SUN_OPENPROMFS |
501 | tristate "Openprom tree appears in /proc/openprom" | 485 | tristate "Openprom tree appears in /proc/openprom" |
502 | help | 486 | help |