summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-071-0/+3
|\
| * ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platformsDmitry Eremin-Solenikov2011-02-271-0/+3
* | pcmcia: re-enable Zoomed Video supportDominik Brodowski2011-02-201-0/+2
* | pcmcia vs. MECR on pxa25x/sa1111Pavel Machek2011-02-193-1/+3
|/
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-6/+6
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2011-01-133-3/+3
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-12-2210-14/+20
| |\
| * | tree-wide: fix comment/printk typosUwe Kleine-König2010-11-013-3/+3
* | | Merge branch 'devel-stable' into develRussell King2011-01-066-20/+292
|\ \ \
| * | | ARM: pxa: Update Balloon3 for new FPGA firmwareMarek Vasut2010-12-201-6/+5
| * | | ARM: pxa: Colibri PXA320 PCMCIA driverMarek Vasut2010-12-203-2/+19
| * | | ARM: pxa: Toradex Colibri PXA270 CF supportMarek Vasut2010-12-203-1/+216
| * | | ARM: pxa: Add pxa320 PCMCIA checkMarek Vasut2010-12-201-3/+18
| * | | ARM: pxa: remove get_memclk_frequency_10khz()Eric Miao2010-12-162-3/+17
| * | | ARM: pxa: Access SMEMC via virtual addressesMarek Vasut2010-12-161-8/+20
| | |/ | |/|
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver...Russell King2011-01-055-61/+293
|\ \ \ \ \ | |_|_|/ / |/| | | / | | | |/ | | |/|
| | | * ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.Marcelo Roberto Jimenez2010-12-214-1/+225
| | | * ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c.Marcelo Roberto Jimenez2010-12-211-60/+68
| | |/
* | | ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.Marcelo Roberto Jimenez2010-12-041-0/+1
|/ /
* | drivers/pcmcia/soc_common.c: Use printf extension %pVJoe Perches2010-11-101-2/+7
* | pcmcia/sa1100: don't put machine specific init functions in .init.textUwe Kleine-König2010-11-107-7/+7
* | pd6729: Coding Style fixesKomuro2010-11-102-5/+5
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-1/+1
|\
| * Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-1/+1
* | pcmcia: IOCARD is also required for using IRQsDominik Brodowski2010-10-221-1/+3
* | pcmcia: don't call flush_scheduled_work() spuriouslyTejun Heo2010-10-162-7/+0
* | pcmcia/yenta: guide users in case of problems with O2-bridgesWolfram Sang2010-10-151-2/+2
* | pcmcia: fix unused function compile warningMaciej Żenczykowski2010-10-141-1/+1
* | pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable...Rahul Ruikar2010-10-051-19/+39
* | pcmcia: add a few debug statementsDominik Brodowski2010-09-291-0/+10
* | pcmcia: move driver name to struct pcmcia_driverDominik Brodowski2010-09-291-10/+11
* | pcmcia: remove the "Finally, report what we've done" messageDominik Brodowski2010-09-291-0/+7
* | pcmcia: use autoconfiguration feature for ioports and iomemDominik Brodowski2010-09-291-11/+67
* | pcmcia: introduce autoconfiguration featureDominik Brodowski2010-09-291-4/+32
* | pcmcia: Documentation updateDominik Brodowski2010-09-291-22/+89
* | pcmcia: convert pcmcia_request_configuration to pcmcia_enable_deviceDominik Brodowski2010-09-2923-44/+17
* | pcmcia: move config_{base,index,regs} to struct pcmcia_deviceDominik Brodowski2010-09-294-27/+24
* | pcmcia: simplify IntTypeDominik Brodowski2010-09-292-10/+1
* | pcmcia: simplify Status, ExtStatus register accessDominik Brodowski2010-09-292-10/+20
* | pcmcia: remove Pin, Copy configuration register accessDominik Brodowski2010-09-292-7/+9
* | pcmcia: move Vpp setup to struct pcmcia_deviceDominik Brodowski2010-09-291-1/+2
* | pcmcia: split up modify_configuration() into two fixup functionsDominik Brodowski2010-09-291-65/+63
* | pcmcia: do not use win_req_t when calling pcmcia_request_window()Dominik Brodowski2010-09-291-27/+33
* | pcmcia: pd6729: Fix error pathRahul Ruikar2010-09-261-1/+1
* | pcmcia: preserve configuration information if request_io fails partlyDominik Brodowski2010-09-181-0/+6
* | pcmcia: per-device, not per-socket debug messagesDominik Brodowski2010-09-151-24/+27
* | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-122-5/+5
|\ \
| * | of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-062-5/+5
* | | Merge branches 'master' and 'devel' into for-linusRussell King2010-08-103-1/+160
|\ \ \ | |_|/ |/| |
| * | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/...Russell King2010-08-063-1/+160
| |\ \ | | |/ | |/|
OpenPOWER on IntegriCloud