summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
...
| * pcmcia: deprecate CS_BAD_VCC and CS_BAD_VPPDominik Brodowski2008-08-232-11/+21
| * pcmcia: deprecate CS_UNSUPPORTED_*Dominik Brodowski2008-08-235-11/+12
| * pcmcia: deprecate CS_OUT_OF_RESOURCEDominik Brodowski2008-08-233-30/+47
| * pcmcia: deprecate unused CS_ error codesDominik Brodowski2008-08-231-10/+0
| * pcmcia: deprecate CS_SUCCESSDominik Brodowski2008-08-238-68/+77
| * pcmcia: move pccard_get_configuration_info to ioctlDominik Brodowski2008-08-233-80/+72
| *-. Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmciaDominik Brodowski2008-08-2318-192/+304
| |\ \
| | | * pcmcia: don't add extra DEBUG cflagDominik Brodowski2008-08-2313-19/+15
| | | * pcmcia: remove unused cs_socket_name() definitionDominik Brodowski2008-08-231-2/+0
| | | * pcmcia: use dev_printk in module rsrc_nonstaticDominik Brodowski2008-08-231-15/+18
| | | * pcmcia: use dev_printk in module pcmciaDominik Brodowski2008-08-232-67/+81
| | | * pcmcia: use dev_printk in module pcmcia_coreDominik Brodowski2008-08-233-12/+17
| | | * pcmcia: use dev_printk and dev_dbg in yenta_socketDominik Brodowski2008-08-233-77/+97
| | * | pcmcia: pcmcia_config_loop() improvement by passing vccDominik Brodowski2008-08-231-1/+6
| | * | pcmcia: pcmcia_config_loop() default CIS entry handlingDominik Brodowski2008-08-231-1/+6
| | * | pcmcia: pcmcia_config_loop() ConfigIndex unificationDominik Brodowski2008-08-231-2/+6
| | * | pcmcia: add pcmcia_loop_config() helperDominik Brodowski2008-08-231-0/+62
| | |/
| * | pcmcia: only copy CIS override data onceDominik Brodowski2008-08-024-32/+13
| |/
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-119-41/+825
|\ \
| * \ Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.gitRussell King2008-10-091-1/+5
| |\ \
| * | | [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-074-24/+204
| |\ \ \
| | * | | Add support for the Arcom/Eurotech Viper SBC CompactFlash card slotMarc Zyngier2008-09-094-23/+203
| * | | | Merge branch 'pxa-palm' into pxa-machinesRussell King2008-10-072-1/+153
| |\ \ \ \
| | * | | | [ARM] 5199/1: PalmLD: PCMCIA driverMarek Vašut2008-08-162-1/+153
| | |/ / /
| * | | | Merge branch 'pxa-trizeps' into pxa-machinesRussell King2008-10-073-1/+258
| |\ \ \ \
| | * | | | [ARM] pxa: trizeps4: remove unused variableRussell King2008-10-071-1/+0
| | * | | | [ARM] 5294/1: Trizeps4 PCMCIA supportJürgen Schindele2008-10-073-1/+259
| | |/ / /
| * | | | [ARM] 5283/1: pxa: add CM-X255 pcmcia supportMike Rapoport2008-10-074-13/+206
| |/ / /
* | | | pcmcia: Fix broken abuse of dev->driver_dataAlan Cox2008-09-221-9/+14
| |/ / |/| |
* | | [ARM] 5245/1: Fix warning about unused return value in drivers/pcmciaJürgen Schindele2008-09-131-1/+5
|/ /
* | [ARM] 5198/1: PalmTX: PCMCIA fixesMarek Vašut2008-08-161-2/+47
* | [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/machRussell King2008-08-0719-38/+38
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesRussell King2008-08-071-1/+1
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2008-08-041-1/+1
| |\ \ | | |/ | |/|
| | * pcmcia: rsrc_nonstatic: check value, not pointerDominik Brodowski2008-07-281-1/+1
* | | [ARM] Remove asm/hardware.h, use asm/arch/hardware.h insteadRussell King2008-08-0717-17/+17
|/ /
* | [ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*Dmitry Baryshkov2008-07-271-6/+6
* | PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architecturesAndrea Righi2008-07-241-0/+1
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-234-67/+148
|\ \ | |/ |/|
| * Merge branch 'pxa' into develRussell King2008-07-136-80/+175
| |\
| | *-. Merge branches 'pxa-ian' and 'pxa-xm270' into pxaRussell King2008-07-121-66/+27
| | |\ \
| | | | * [ARM] 5104/1: CM-X270: PCMCIA updatesMike Rapoport2008-07-091-66/+27
| | | |/
| | * | [ARM] 5154/1: PalmTX PCMCIAMarek Vašut2008-07-103-1/+121
| | * | Merge branch 'machtypes' into pxa-palmRussell King2008-07-091-0/+1
| | |\ \ | | | |/ | | |/|
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2008-07-171-1/+1
|\ \ \ \
| * | | | pcmcia: fix cisinfo_t removalMarc Zyngier2008-07-151-1/+1
* | | | | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-buildBenjamin Herrenschmidt2008-07-1528-312/+652
|\ \ \ \ \
| * \ \ \ \ Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-144-25/+40
| |\ \ \ \ \
| | * \ \ \ \ [ARM] Merge most of the PXA work for initial mergeRussell King2008-07-143-13/+27
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
OpenPOWER on IntegriCloud