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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 58bee55a3dd3..9f3adbd9f700 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -64,7 +64,7 @@ config PCMCIA_IOCTL
           If unsure, say Y.
 
 config CARDBUS
-        bool "32-bit CardBus support"   
+        bool "32-bit CardBus support"
         depends on PCI
         default y
         ---help---
@@ -87,8 +87,8 @@ config YENTA
         select PCCARD_NONSTATIC
         ---help---
           This option enables support for CardBus host bridges.  Virtually
-          all modern PCMCIA bridges are CardBus compatible.  A "bridge" is 
-          the hardware inside your computer that PCMCIA cards are plugged 
+          all modern PCMCIA bridges are CardBus compatible.  A "bridge" is
+          the hardware inside your computer that PCMCIA cards are plugged
           into.
 
           To compile this driver as modules, choose M here: the