Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: CodingStyle fixes
  pcmcia: remove unused IRQ_FIRST_SHARED

diff --cc drivers/net/pcmcia/axnet_cs.c
Simple merge

diff --cc drivers/net/pcmcia/fmvj18x_cs.c
Simple merge

diff --cc drivers/net/pcmcia/pcnet_cs.c
Simple merge

diff --cc drivers/net/pcmcia/smc91c92_cs.c
Simple merge

diff --cc drivers/net/pcmcia/xirc2ps_cs.c
Simple merge

diff --cc drivers/pcmcia/Kconfig
Simple merge

diff --cc drivers/pcmcia/cardbus.c
index a73b040ddbfb81102fffe2a6da4768155f7689e3,5e9b636cbf71adc264a462d59ca2205ea55bd422..cdf50f3bc2df389af234ed8976017ba5c717e218
--- 1/drivers/pcmcia/cardbus.c
--- 2/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@@ -181,10 -182,15 +182,10 @@@ fail
      cb_alloc() and cb_free() allocate and free the kernel data
      structures for a Cardbus device, and handle the lowest level PCI
      device setup issues.
-     
+ 
  =====================================================================*/
  
 -/*
 - * Since there is only one interrupt available to CardBus
 - * devices, all devices downstream of this device must
 - * be using this IRQ.
 - */
 -static void cardbus_assign_irqs(struct pci_bus *bus, int irq)
 +static void cardbus_config_irq_and_cls(struct pci_bus *bus, int irq)
  {
        struct pci_dev *dev;