summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* pccard: configure CLS on attachTejun Heo2009-11-041-8/+15
* PM / yenta: Split resume into early and late parts (rev. 4)Rafael J. Wysocki2009-11-032-27/+54
* pcmcia: do not load the pd6729 driver if io_base is NULLKomuro2009-10-241-0/+6
* pcmcia: Fix possible printk format warningsWolfram Sang2009-10-204-16/+24
* pcmcia: do not try to store more than 4 version stringsDominik Brodowski2009-10-191-1/+1
* pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanupDominik Brodowski2009-10-196-17/+18
* pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probeFrans Pop2009-10-171-0/+1
* pcmcia: fix controller printk format warningsRandy Dunlap2009-10-172-4/+4
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-10-022-2/+2
|\
| * ARM: Fix SA1100 Assabet/Neponset PCMCIA section mismatch warningsRussell King2009-09-282-2/+2
* | MIPS: BCM63xx: Add PCMCIA & Cardbus support.Maxime Bizon2009-09-304-0/+601
* | PM / yenta: Fix cardbus suspend/resume regressionRafael J. Wysocki2009-09-291-40/+48
* | PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()Rafael J. Wysocki2009-09-2917-17/+17
|/
* Merge branch 'origin' into for-linusRussell King2009-09-243-88/+106
|\
| * pcmcia: cleanup/fixup patch for sa1100_jornada_pcmcia driverKristoffer Ericson2009-09-221-71/+85
| * pcmcia: switch /proc/bus/pccard/drivers to seq_fileAlexey Dobriyan2009-09-221-16/+20
| * pcmcia: yenta: add missing __devexit markingMike Frysinger2009-09-221-1/+1
* | Merge branch 'master' into for-linusRussell King2009-09-227-16/+17
|\ \ | |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6Linus Torvalds2009-09-166-8/+9
| |\
| | * pcmcia: document return value of pcmcia_loop_configWolfram Sang2009-09-151-2/+2
| | * pcmcia: drop non-existant includesWolfram Sang2009-09-152-2/+0
| | * pcmcia: disable prefetch/burst for OZ6933Tomas Kovacik2009-09-151-0/+4
| | * pcmcia: fix incorrect argument order to list_add_tail()Wolfram Sang2009-09-151-2/+1
| | * pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolonsJoe Perches2009-09-151-1/+1
| | * pcmcia: drivers/pcmcia: Make staticRoel Kluin2009-09-151-1/+1
| * | yenta: Use pci_claim_resourceMatthew Wilcox2009-09-091-8/+8
| |/
* | [ARM] pxa: update pcmcia/pxa2xx_base.c to use 'struct dev_pm_ops'Mike Rapoport2009-09-101-7/+11
* | [ARM] pxa/palm: fix possibly uninitialized variable in PalmTC-pcmciaMarek Vasut2009-09-101-1/+1
* | [ARM] pxa: Palm Tungsten|C PCMCIA supportMarek Vasut2009-09-102-0/+231
|/
* Remove multiple KERN_ prefixes from printk formatsJoe Perches2009-07-081-1/+2
* Update Yoichi Yuasa's e-mail addressYoichi Yuasa2009-07-033-5/+5
* Merge branch 'akpm'Linus Torvalds2009-06-161-6/+3
|\
| * use printk_once() in several placesMinchan Kim2009-06-161-6/+3
* | pcmcia: remove driver_data direct access of struct deviceGreg Kroah-Hartman2009-06-151-4/+4
* | firmware: pcmcia/ds: prepare for FIRMWARE_NAME_MAX removalSamuel Ortiz2009-06-151-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-231-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-247-68/+159
| * pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2009-03-241-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
|\
OpenPOWER on IntegriCloud