summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-0547-977/+1046
|\
| * pcmcia: rework the irq_req_t typedefDominik Brodowski2009-11-281-9/+9
| * pcmcia: pcmcia_request_window() doesn't need a pointer to a pointerDominik Brodowski2009-11-281-3/+3
| * pcmcia: remove unused "window_t" typedefDominik Brodowski2009-11-282-32/+32
| * pcmcia: move some window-related code to pcmcia_ioctl.cDominik Brodowski2009-11-283-63/+55
| * pcmcia: Change window_handle_t logic to unsigned longMagnus Damm2009-11-283-33/+34
| * pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()Magnus Damm2009-11-283-2/+7
| * pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()Magnus Damm2009-11-281-1/+4
| * pcmcia: Pass struct pcmcia_device to pcmcia_release_window()Magnus Damm2009-11-281-2/+3
| * drivers/pcmcia: remove unnecessary kzallocJulia Lawall2009-11-221-4/+0
| * pcmcia: correct handling for Zoomed Video registers in topic.hAvi Cohen Stuart2009-11-111-10/+5
| * pcmcia: autoload module pcmciaDominik Brodowski2009-11-091-0/+7
| * PCMCIA: stop duplicating pci_irq in soc_pcmcia_socketRussell King - ARM Linux2009-11-0919-24/+23
| * PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socketRussell King - ARM Linux2009-11-093-3/+0
| * PCMCIA: soc_common: constify soc_pcmcia_socket ops memberRussell King - ARM Linux2009-11-091-1/+1
| * PCMCIA: sa1111: remove duplicated initializersRussell King - ARM Linux2009-11-096-43/+17
| * PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific dataRussell King - ARM Linux2009-11-0910-40/+123
| * PCMCIA: soc_common: push socket probe down into SoC specific supportRussell King - ARM Linux2009-11-094-104/+103
| * PCMCIA: soc_common: push socket removal down to SoC specific supportRussell King - ARM Linux2009-11-095-20/+29
| * PCMCIA: soc_common: provide single socket add/remove functionalityRussell King - ARM Linux2009-11-092-108/+125
| * PCMCIA: soc_common: convert to a stand alone moduleRussell King - ARM Linux2009-11-093-15/+17
| * pcmcia: use dev_dbg and dev_print in pd6729.cDominik Brodowski2009-11-092-40/+37
| * pcmcia: remove now-defunct cs_error, pcmcia_error_{func,ret}Dominik Brodowski2009-11-091-101/+0
| * pcmcia: extend error reporting and debug messages in coreDominik Brodowski2009-11-082-13/+43
| * pcmcia: use dynamic debug in PCMCIA socket driversDominik Brodowski2009-11-086-180/+118
| * pcmcia: use dynamic debug instead of custom infrastructureDominik Brodowski2009-11-087-174/+100
| * pcmcia: remove pcmcia_get_{first,next}_tuple()Dominik Brodowski2009-11-081-0/+9
| * pcmcia: add new CIS access helpersDominik Brodowski2009-11-084-32/+254
| * pcmcia: drop already defined PCI_IDsWolfram Sang2009-10-242-32/+0
* | 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
OpenPOWER on IntegriCloud