Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (23 commits) pcmcia: Fix ide-cs sparse warning pcmcia: ide-cs debugging bugfix pcmcia: allow for longer CIS firmware files pcmcia: cm40x0 cdev lock_kernel() pushdown pcmcia: (re)move {pcmcia,pccard}_get_status pcmcia: kill IN_CARD_SERVICES pcmcia: Remove unused header file code pcmcia: remove unused bulkmem.h pcmcia: simplify pccard_validate_cis pcmcia: carve out ioctl adjust function to pcmcia_ioctl pcmcia: irq probe can be done without risking an IRQ storm pcmcia: Fix ti12xx_2nd_slot_empty always failing pcmcia: check for pointer instead of pointer address pcmcia: switch cm4000_cs.c to unlocked_ioctl pcmcia: simplify rsrc_nonstatic attributes pcmcia: add support CompactFlash PCMCIA support for Blackfin. pcmcia: remove version.h pcmcia: cs: kill thread_wait pcmcia: i82365.c: check request_irq return value pcmcia: fix Alchemy warnings ...
Showing
- drivers/char/pcmcia/cm4000_cs.c 75 additions, 43 deletionsdrivers/char/pcmcia/cm4000_cs.c
- drivers/char/pcmcia/cm4040_cs.c 17 additions, 6 deletionsdrivers/char/pcmcia/cm4040_cs.c
- drivers/char/pcmcia/ipwireless/main.c 0 additions, 1 deletiondrivers/char/pcmcia/ipwireless/main.c
- drivers/ide/legacy/ide-cs.c 5 additions, 5 deletionsdrivers/ide/legacy/ide-cs.c
- drivers/mtd/ftl.c 0 additions, 4 deletionsdrivers/mtd/ftl.c
- drivers/mtd/maps/pcmciamtd.c 2 additions, 7 deletionsdrivers/mtd/maps/pcmciamtd.c
- drivers/pcmcia/Kconfig 7 additions, 0 deletionsdrivers/pcmcia/Kconfig
- drivers/pcmcia/Makefile 1 addition, 0 deletionsdrivers/pcmcia/Makefile
- drivers/pcmcia/au1000_generic.h 15 additions, 12 deletionsdrivers/pcmcia/au1000_generic.h
- drivers/pcmcia/au1000_pb1x00.c 0 additions, 1 deletiondrivers/pcmcia/au1000_pb1x00.c
- drivers/pcmcia/au1000_xxs1500.c 0 additions, 1 deletiondrivers/pcmcia/au1000_xxs1500.c
- drivers/pcmcia/bfin_cf_pcmcia.c 339 additions, 0 deletionsdrivers/pcmcia/bfin_cf_pcmcia.c
- drivers/pcmcia/cardbus.c 0 additions, 2 deletionsdrivers/pcmcia/cardbus.c
- drivers/pcmcia/cistpl.c 9 additions, 7 deletionsdrivers/pcmcia/cistpl.c
- drivers/pcmcia/cs.c 3 additions, 11 deletionsdrivers/pcmcia/cs.c
- drivers/pcmcia/cs_internal.h 0 additions, 13 deletionsdrivers/pcmcia/cs_internal.h
- drivers/pcmcia/ds.c 5 additions, 7 deletionsdrivers/pcmcia/ds.c
- drivers/pcmcia/hd64465_ss.c 0 additions, 3 deletionsdrivers/pcmcia/hd64465_ss.c
- drivers/pcmcia/i82092.c 0 additions, 2 deletionsdrivers/pcmcia/i82092.c
- drivers/pcmcia/i82092aa.h 0 additions, 2 deletionsdrivers/pcmcia/i82092aa.h
Loading
Please register or sign in to comment