summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm'Linus Torvalds2009-06-171-6/+3
|\
| * use printk_once() in several placesMinchan Kim2009-06-171-6/+3
* | pcmcia: remove driver_data direct access of struct deviceGreg Kroah-Hartman2009-06-161-4/+4
* | firmware: pcmcia/ds: prepare for FIRMWARE_NAME_MAX removalSamuel Ortiz2009-06-161-11/+1
|/
* [ARM] pxa/stargate2: add support for Compact Flash/PCMCIAJonathan Cameron2009-06-053-1/+176
* [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop configDmitry Baryshkov2009-04-241-0/+3
* [ARM] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driverMike Rapoport2009-04-021-1/+1
* Merge branch 'origin' into develRussell King2009-03-288-69/+160
|\
| * platform driver: fix incorrect use of 'platform_bus_type' with 'struct device...Ming Lei2009-03-257-68/+159
| * pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2009-03-251-1/+1
* | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2009-03-282-4/+4
|\ \
| * | [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0Marek Vasut2009-03-282-4/+4
* | | [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.hRussell King2009-03-252-2/+2
* | | [ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpersDmitry Artamonow2009-03-151-13/+10
|/ /
* | [ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.hEric Miao2009-03-092-4/+2
* | [ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.cEric Miao2009-03-094-55/+140
* | [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.hEric Miao2009-03-096-7/+0
|/
* powerpc: Change u64/s64 to a long long integer typeIngo Molnar2009-01-131-1/+1
* Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/l...Russell King2008-12-171-1/+1
|\
| * pcmcia: blackfin: fix bug - add missing ; to MODULE macroMike Frysinger2008-12-161-1/+1
* | [PCMCIA] e740 PCMCIA socket driver.Ian Molton2008-12-153-1/+178
|/
* pcmcia: ensure correct logging in do_io_probeDominik Brodowski2008-11-091-6/+6
* pcmcia: add braces in error pathDominik Brodowski2008-11-021-1/+2
* pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2008-11-023-9/+8
* pcmcia: setup resource information for pseudo multifunction devices.Komuro2008-11-021-0/+2
* pcmcia: fix indentation & braces disagreement - add bracesIlpo Järvinen2008-11-011-1/+2
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2008-10-311-1/+2
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-301-1/+2
| |\
| | * pcmcia: Whine harder about use of EXCLUSIVEAlan Cox2008-10-171-1/+2
* | | sh: Kill off long-dead HD64465 cchip support.Paul Mundt2008-10-283-944/+0
|/ /
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-231-1/+1
|\ \
| * | [ARM] pxa: fix trizeps PCMCIA buildRussell King2008-10-171-1/+1
| |/
* | Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-10-203-5/+11
|\ \ | |/ |/|
| * generic: sparse irqs: use irq_desc() together with dyn_array, instead of irq_...Yinghai Lu2008-10-161-3/+9
| * drivers/pcmcia: use nr_irqsYinghai Lu2008-10-162-2/+2
* | [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build errorMike Rapoport2008-10-151-1/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2008-10-1327-710/+943
|\
| * pcmcia: remove unused argument to pcmcia_parse_tuple()Dominik Brodowski2008-08-314-5/+7
| * pcmcia: card services header cleanupDominik Brodowski2008-08-313-4/+14
| * pcmcia: encapsulate ioaddr_tDominik Brodowski2008-08-292-2/+2
| * pcmcia: cleanup socket services header fileDominik Brodowski2008-08-261-0/+27
| * pcmcia: merge ds_internal.h into cs_internal.hDominik Brodowski2008-08-255-32/+40
| * pcmcia: cleanup cs_internal.hDominik Brodowski2008-08-251-64/+90
| * pcmcia: cs_internal.h is internalDominik Brodowski2008-08-255-5/+0
| * pcmcia: use dev_printk for cs_error()Dominik Brodowski2008-08-231-32/+18
| * pcmcia: deprecate CS_BAD_TUPLEDominik Brodowski2008-08-234-55/+98
| * pcmcia: deprecate CS_BAD_ARGSDominik Brodowski2008-08-233-9/+10
| * pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZEDominik Brodowski2008-08-233-15/+18
| * pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGEDominik Brodowski2008-08-234-27/+34
| * pcmcia: deprecate CS_NO_MORE_ITEMSDominik Brodowski2008-08-234-8/+8