From fc3b22cc8d499a4f4ef10cfb31549a22096eb509 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 23 Nov 2008 21:50:16 -0800 Subject: [PATCH] --- yaml --- r: 123335 b: refs/heads/master c: c6afec5e4d323e7b88a7d6e291a5aa021a8fcb7d h: refs/heads/master i: 123333: 5868e3dbbfcd65df999d6ab223800e4267e72c8d 123331: 82874e70820d7d5f81d8f07e66439a6c3e7e966b 123327: ee35405084e91aed7641e02ccf7fa6cd0444d896 v: v3 --- [refs] | 2 +- trunk/arch/sparc/Kconfig | 20 ++------------------ trunk/arch/sparc/include/asm/system_32.h | 5 +++++ 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 7788f1fc0399..b23c47fe45af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c2551ab99f9ba3c726e6a41c84ef0c7390fc546 +refs/heads/master: c6afec5e4d323e7b88a7d6e291a5aa021a8fcb7d diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index 41c4cd2c81bd..10945c344304 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/arch/sparc/Kconfig @@ -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 - 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. - config SBUS bool default y @@ -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 diff --git a/trunk/arch/sparc/include/asm/system_32.h b/trunk/arch/sparc/include/asm/system_32.h index 8623fc48fe24..79c1ae2b42a3 100644 --- a/trunk/arch/sparc/include/asm/system_32.h +++ b/trunk/arch/sparc/include/asm/system_32.h @@ -15,6 +15,11 @@ #include +static inline unsigned int probe_irq_mask(unsigned long val) +{ + return 0; +} + /* * Sparc (general) CPU types */