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

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
  pcmcia: ide-cs: Remove outdated comment
  pcmcia: fix cisinfo_t removal
  pcmcia: fix return value in cm4000_cs.c

diff --combined drivers/ide/legacy/ide-cs.c
index fc53dcfbfe38a9d108a7ed06b73cc9eaa5b7b6af,41a2e251d53d73930c565b262cc564bd721429f4..27b1e0b7ecb49b8b68e18248a1b53b80982f83ce
--- 1/drivers/ide/legacy/ide-cs.c
--- 2/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@@ -66,8 -66,6 +66,6 @@@ MODULE_LICENSE("Dual MPL/GPL")
  #ifdef CONFIG_PCMCIA_DEBUG
  INT_MODULE_PARM(pc_debug, 0);
  #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
- /*static char *version =
- "ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/
  #else
  #define DEBUG(n, args...)
  #endif
@@@ -154,11 -152,6 +152,11 @@@ static const struct ide_port_ops idecs_
        .quirkproc              = ide_undecoded_slave,
  };
  
 +static const struct ide_port_info idecs_port_info = {
 +      .port_ops               = &idecs_port_ops,
 +      .host_flags             = IDE_HFLAG_NO_DMA,
 +};
 +
  static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
                                unsigned long irq, struct pcmcia_device *handle)
  {
@@@ -192,11 -185,13 +190,11 @@@
  
      i = hwif->index;
  
 -    ide_init_port_data(hwif, i);
      ide_init_port_hw(hwif, &hw);
 -    hwif->port_ops = &idecs_port_ops;
  
      idx[0] = i;
  
 -    ide_device_add(idx, NULL);
 +    ide_device_add(idx, &idecs_port_info);
  
      if (hwif->present)
        return hwif;