---

yaml
---
r: 123335
b: refs/heads/master
c: c6afec5
h: refs/heads/master
i:
  123333: 5868e3d
  123331: 82874e7
  123327: ee35405
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c2551ab99f9ba3c726e6a41c84ef0c7390fc546
+refs/heads/master: c6afec5e4d323e7b88a7d6e291a5aa021a8fcb7d

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 <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
@@ -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

trunk/arch/sparc/include/asm/system_32.h

@@ -15,6 +15,11 @@
 
 #include <linux/irqflags.h>
 
+static inline unsigned int probe_irq_mask(unsigned long val)
+{
+	return 0;
+}
+
 /*
  * Sparc (general) CPU types
  */