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: (23 commits)
  pcmcia: Fix ide-cs sparse warning
  pcmcia: ide-cs debugging bugfix
  pcmcia: allow for longer CIS firmware files
  pcmcia: cm40x0 cdev lock_kernel() pushdown
  pcmcia: (re)move {pcmcia,pccard}_get_status
  pcmcia: kill IN_CARD_SERVICES
  pcmcia: Remove unused header file code
  pcmcia: remove unused bulkmem.h
  pcmcia: simplify pccard_validate_cis
  pcmcia: carve out ioctl adjust function to pcmcia_ioctl
  pcmcia: irq probe can be done without risking an IRQ storm
  pcmcia: Fix ti12xx_2nd_slot_empty always failing
  pcmcia: check for pointer instead of pointer address
  pcmcia: switch cm4000_cs.c to unlocked_ioctl
  pcmcia: simplify rsrc_nonstatic attributes
  pcmcia: add support CompactFlash PCMCIA support for Blackfin.
  pcmcia: remove version.h
  pcmcia: cs: kill thread_wait
  pcmcia: i82365.c: check request_irq return value
  pcmcia: fix Alchemy warnings
  ...

diff --combined drivers/ide/legacy/ide-cs.c
index 3381424d70a195ed70bb3525e0160d96c18af033,99af3bb6c4617aef2be5506b67fbfcfe4859636f..8dbf4d9b6447cdd6e6bf2add89382b1f55ec0213
--- 1/drivers/ide/legacy/ide-cs.c
--- 2/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@@ -63,11 -63,11 +63,11 @@@ MODULE_LICENSE("Dual MPL/GPL")
  
  #define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0)
  
- #ifdef PCMCIA_DEBUG
- INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
+ #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)";
+ /*static char *version =
+ "ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/
  #else
  #define DEBUG(n, args...)
  #endif
@@@ -135,17 -135,13 +135,17 @@@ static void ide_detach(struct pcmcia_de
  {
      ide_info_t *info = link->priv;
      ide_hwif_t *hwif = info->hwif;
 +    unsigned long data_addr, ctl_addr;
  
      DEBUG(0, "ide_detach(0x%p)\n", link);
  
 +    data_addr = hwif->io_ports.data_addr;
 +    ctl_addr  = hwif->io_ports.ctl_addr;
 +
      ide_release(link);
  
 -    release_region(hwif->io_ports.ctl_addr, 1);
 -    release_region(hwif->io_ports.data_addr, 8);
 +    release_region(ctl_addr, 1);
 +    release_region(data_addr, 8);
  
      kfree(info);
  } /* ide_detach */
@@@ -198,16 -194,6 +198,16 @@@ static ide_hwif_t *idecs_register(unsig
      if (hwif->present)
        return hwif;
  
 +    /* retry registration in case device is still spinning up */
 +    for (i = 0; i < 10; i++) {
 +      msleep(100);
 +      ide_port_scan(hwif);
 +      if (hwif->present)
 +          return hwif;
 +    }
 +
 +    return hwif;
 +
  out_release:
      release_region(ctl, 1);
      release_region(io, 8);
@@@ -236,7 -222,7 +236,7 @@@ static int ide_config(struct pcmcia_dev
        cistpl_cftable_entry_t dflt;
      } *stk = NULL;
      cistpl_cftable_entry_t *cfg;
 -    int i, pass, last_ret = 0, last_fn = 0, is_kme = 0;
 +    int pass, last_ret = 0, last_fn = 0, is_kme = 0;
      unsigned long io_base, ctl_base;
      ide_hwif_t *hwif;
  
@@@ -333,15 -319,30 +333,15 @@@
      if (is_kme)
        outb(0x81, ctl_base+1);
  
 -    /* retry registration in case device is still spinning up */
 -    for (i = 0; i < 10; i++) {
 -      hwif = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link);
 -      if (hwif)
 -          break;
 -      if (link->io.NumPorts1 == 0x20) {
 +     hwif = idecs_register(io_base, ctl_base, link->irq.AssignedIRQ, link);
 +     if (hwif == NULL && link->io.NumPorts1 == 0x20) {
            outb(0x02, ctl_base + 0x10);
            hwif = idecs_register(io_base + 0x10, ctl_base + 0x10,
                                  link->irq.AssignedIRQ, link);
 -          if (hwif) {
 -              io_base += 0x10;
 -              ctl_base += 0x10;
 -              break;
 -          }
 -      }
 -      msleep(100);
      }
  
 -    if (hwif == NULL) {
 -      printk(KERN_NOTICE "ide-cs: ide_register() at 0x%3lx & 0x%3lx"
 -             ", irq %u failed\n", io_base, ctl_base,
 -             link->irq.AssignedIRQ);
 +    if (hwif == NULL)
        goto failed;
 -    }
  
      info->ndev = 1;
      sprintf(info->node.dev_name, "hd%c", 'a' + hwif->index * 2);
@@@ -375,7 -376,7 +375,7 @@@ failed
  
  ======================================================================*/
  
- void ide_release(struct pcmcia_device *link)
+ static void ide_release(struct pcmcia_device *link)
  {
      ide_info_t *info = link->priv;
      ide_hwif_t *hwif = info->hwif;
@@@ -410,7 -411,6 +410,7 @@@ static struct pcmcia_device_id ide_ids[
        PCMCIA_DEVICE_MANF_CARD(0x001c, 0x0001),        /* Mitsubishi CFA */
        PCMCIA_DEVICE_MANF_CARD(0x0032, 0x0704),
        PCMCIA_DEVICE_MANF_CARD(0x0045, 0x0401),        /* SanDisk CFA */
 +      PCMCIA_DEVICE_MANF_CARD(0x004f, 0x0000),        /* Kingston */
        PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),        /* Toshiba */
        PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),
        PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),        /* Samsung */
@@@ -440,7 -440,6 +440,7 @@@
        PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
        PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
        PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
 +      PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF300", 0x7ed2ad87, 0x7e9e78ee),
        PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
        PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
        PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
@@@ -451,7 -450,6 +451,7 @@@
        PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
        PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
        PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
 +      PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF45", 0x709b1bf1, 0xf68b6f32),
        PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),
        PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),
        PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),