aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branches 'master' and 'devel' into for-linusRussell King2010-08-101-0/+1
|\
| * [ARM] pxa/balloon3: PCMCIA SupportMarek Vasut2010-08-051-0/+1
* | pcmcia: remove obsolete ioctlDominik Brodowski2010-07-301-1/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-05-201-3/+6
|\
| * pcmcia: move all pcmcia_resource_ops providers into one moduleDominik Brodowski2010-05-101-2/+5
| * pcmcia: move high level CIS access code to separate fileDominik Brodowski2010-05-101-1/+1
* | [ARM] pxa: add support for Voipac PXA270 PCMCIAMarek Vasut2010-05-111-0/+1
|/
* Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-02-271-9/+3
|\
| * MIPS: Alchemy: XXS1500 PCMCIA driver rewriteManuel Lauss2010-02-271-1/+2
| * MIPS: PCMCIA: new socket driver for Au1000 demoboards.Manuel Lauss2010-02-271-8/+1
* | pcmcia: move cistpl.c into pcmcia moduleDominik Brodowski2010-02-171-2/+2
|/
* [ARM] pxa/zeus: make Viper pcmcia support more generic to support ZeusMarc Zyngier2009-12-131-1/+1
* PCMCIA: soc_common: convert to a stand alone moduleRussell King - ARM Linux2009-11-091-6/+4
* MIPS: BCM63xx: Add PCMCIA & Cardbus support.Maxime Bizon2009-09-301-0/+1
* [ARM] pxa: Palm Tungsten|C PCMCIA supportMarek Vasut2009-09-101-0/+1
* [ARM] pxa/stargate2: add support for Compact Flash/PCMCIAJonathan Cameron2009-06-051-0/+1
* [PCMCIA] e740 PCMCIA socket driver.Ian Molton2008-12-151-0/+1
* sh: Kill off long-dead HD64465 cchip support.Paul Mundt2008-10-281-1/+0
* [ARM] pxa: fix trizeps PCMCIA buildRussell King2008-10-171-1/+1
* [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-131-4/+0
|\
| * pcmcia: don't add extra DEBUG cflagDominik Brodowski2008-08-231-4/+0
* | [ARM] pxa: allow multi-machine PCMCIA buildsRussell King2008-10-071-9/+11
* | Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-armRussell King2008-10-071-1/+1
|\ \
| * | Add support for the Arcom/Eurotech Viper SBC CompactFlash card slotMarc Zyngier2008-09-091-0/+1
| |/
* | Merge branch 'pxa-palm' into pxa-machinesRussell King2008-10-071-1/+2
|\ \
| * | [ARM] 5199/1: PalmLD: PCMCIA driverMarek Vašut2008-08-161-1/+2
| |/
* | Merge branch 'pxa-trizeps' into pxa-machinesRussell King2008-10-071-0/+1
|\ \
| * | [ARM] 5294/1: Trizeps4 PCMCIA supportJürgen Schindele2008-10-071-0/+1
| |/
* / [ARM] 5283/1: pxa: add CM-X255 pcmcia supportMike Rapoport2008-10-071-1/+1
|/
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-231-0/+1
|\
| * [ARM] 5154/1: PalmTX PCMCIAMarek Vašut2008-07-101-0/+1
* | pcmcia: add support CompactFlash PCMCIA support for Blackfin.Michael Hennerich2008-06-241-0/+1
|/
* pcmcia: CompactFlash driver for PA Semi Electra boardsOlof Johansson2007-10-171-0/+1
* [ARM] 4578/1: CM-x270: PCMCIA supportMike Rapoport2007-10-151-0/+1
* [PATCH] pcmcia: AT91RM9200 Compact Flash driverAndrew Victor2006-03-311-0/+1
* [PATCH] pcmcia: remove pcmcia_compat.cDominik Brodowski2006-03-311-1/+1
* [PCMCIA] MPC8xx PCMCIA updateMarcelo Tosatti2005-11-101-3/+3
* Merge ../linux-2.6 by handPaul Mackerras2005-10-311-0/+3
|\
| * [ARM] Support pcmcia slot on sharp sl-5500Pavel Machek2005-10-301-0/+1
| * Updated pcmcia driver with pb1200 and db1200 support.Pete Popov2005-10-291-0/+2
* | [PATCH] MPC8xx PCMCIA driverMarcelo Tosatti2005-10-291-0/+1
|/
* [PATCH] pcmcia: OMAP CF controllerDavid Brownell2005-09-091-0/+1
* [PATCH] pcmcia: move pcmcia resource handling out of cs.cDominik Brodowski2005-06-271-1/+1
* [PATCH] pcmcia: move PCMCIA ioctl to a separate fileDominik Brodowski2005-06-271-0/+1
* Linux-2.6.12-rc2v2.6.12-rc2Linus Torvalds2005-04-161-0/+65