From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Dec 2009 20:33:02 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: upstream/snapshot3+hdmi~16339
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb1beb29b5c531b12485d7c32174a77120590481;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./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
---

fb1beb29b5c531b12485d7c32174a77120590481
diff --cc drivers/pcmcia/cardbus.c
index a73b040,5e9b636..cdf50f3
--- a/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;