summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-sa1100' of git://git.armlinux.org.uk/~rmk/linux-armLinus Torvalds2018-04-091-4/+0Star
|\
| * ARM: sa1100/shannon: convert to generic CF socketsRussell King2018-04-061-1/+0Star
| * ARM: sa1100/nanoengine: convert to generic CF socketsRussell King2018-04-061-1/+0Star
| * ARM: sa1100/cerf: convert to generic CF socketsRussell King2018-03-241-1/+0Star
| * ARM: sa1100/assabet: convert to generic CF socketsRussell King2018-03-241-1/+0Star
* | pcmcia: remove blackfin driverArnd Bergmann2018-03-261-1/+0Star
* | pcmcia: remove m32r driversArnd Bergmann2018-03-261-2/+0Star
|/
* License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseGreg Kroah-Hartman2017-11-021-0/+1
* Revert "pcmcia: add a new resource manager for non ISA systems"Greg Kroah-Hartman2015-03-111-1/+0Star
* pcmcia: add a new resource manager for non ISA systemsAlan Cox2015-01-121-0/+1
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2014-08-071-1/+0Star
|\
| * pcmcia: Remove m8xx_pcmcia driverScott Wood2014-06-261-1/+0Star
* | pcmcia: sa1100: H3100 and H3600 share a driverArnd Bergmann2014-07-091-0/+1
|/
* pcmcia: add driver for hx4700Paul Parsons2012-05-071-0/+1
* PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.Russell King2012-02-211-4/+4
* PCMCIA: make lubbock socket driver part of sa1111_csRussell King2012-02-211-2/+1Star
* PCMCIA: add Kconfig control for building sa11xx_base.cRussell King2012-02-211-2/+3
* MIPS: Alchemy: remove PB1000 supportManuel Lauss2011-12-071-4/+0Star
* Merge branch 'devel-stable' into develRussell King2011-01-061-0/+2
|\
| * ARM: pxa: Colibri PXA320 PCMCIA driverMarek Vasut2010-12-201-0/+1
| * ARM: pxa: Toradex Colibri PXA270 CF supportMarek Vasut2010-12-201-0/+1
* | ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.Marcelo Roberto Jimenez2010-12-211-1/+2
|/
* Merge branches 'master' and 'devel' into for-linusRussell King2010-08-111-0/+1
|\
| * [ARM] pxa/balloon3: PCMCIA SupportMarek Vasut2010-08-051-0/+1
* | pcmcia: remove obsolete ioctlDominik Brodowski2010-07-301-1/+0Star
|/
* 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-281-9/+3Star
|\
| * MIPS: Alchemy: XXS1500 PCMCIA driver rewriteManuel Lauss2010-02-271-1/+2
| * MIPS: PCMCIA: new socket driver for Au1000 demoboards.Manuel Lauss2010-02-271-8/+1Star
* | 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/+4Star
* 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/+0Star
* [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/+0Star
|\
| * pcmcia: don't add extra DEBUG cflagDominik Brodowski2008-08-231-4/+0Star
* | [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
|\ \