Skip to content

Commit

Permalink
sparc: Include drivers/pcmcia/Kconfig
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Dec 4, 2008
1 parent 2c2551a commit c6afec5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
20 changes: 2 additions & 18 deletions arch/sparc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -435,24 +435,6 @@ config MCA
help
MCA is not supported.

config PCMCIA
tristate
---help---
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
computer. 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.

config SBUS
bool
default y
Expand Down Expand Up @@ -497,6 +479,8 @@ config PCI_SYSCALL

source "drivers/pci/Kconfig"

source "drivers/pcmcia/Kconfig"

config SUN_OPENPROMFS
tristate "Openprom tree appears in /proc/openprom"
help
Expand Down
5 changes: 5 additions & 0 deletions arch/sparc/include/asm/system_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

#include <linux/irqflags.h>

static inline unsigned int probe_irq_mask(unsigned long val)
{
return 0;
}

/*
* Sparc (general) CPU types
*/
Expand Down

0 comments on commit c6afec5

Please sign in to comment.