aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000
Commit message (Expand)AuthorAgeFilesLines
* more driver stuff from 3.2.72Wolfgang Wiedmeyer2015-10-2310-1630/+429
* initial merge with 3.2.72Wolfgang Wiedmeyer2015-10-231-0/+252
|\
| * staging: ft1000: dont cast void* from kmalloc()Thomas Meyer2011-08-231-1/+1
| * staging: fix ft1000 sparse warningsRandy Dunlap2011-08-235-22/+27
| * staging: ft1000_proc needs asm/io.h for inw/outw on sparcPaul Gortmaker2011-08-021-0/+1
| * Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-07-2510-1602/+656
| |\
| | * staging: ft1000: Merge common definitions from USB and PCMCIA driversOndrej Zary2011-07-054-682/+264
| | * staging: ft1000-pcmcia: remove support for v5 firmwareOndrej Zary2011-07-051-293/+129
| | * staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) insteadOndrej Zary2011-07-052-6/+4
| | * staging: ft1000-pcmcia: CodingStyle fixes in ft1000.hOndrej Zary2011-07-051-324/+297
| | * staging: ft1000-pcmcia: remove useless ft1000_release() functionOndrej Zary2011-07-051-15/+1
| | * staging: ft1000-pcmcia: remove unused includes from ft1000_cs.cOndrej Zary2011-07-051-15/+0
| | * staging: ft1000-pcmcia: coding style fixes in ft1000_cs.cOndrej Zary2011-07-051-17/+12
| | * staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write ...Ondrej Zary2011-07-051-34/+0
| | * staging: ft1000-pcmcia: remove misleading and template comments from ft1000_cs.cOndrej Zary2011-07-051-73/+5
| | * staging: ft1000-pcmcia: remove useless debugging from ft1000_cs.cOndrej Zary2011-07-051-18/+0
| | * staging: ft1000-pcmcia: remove useless defines from ft1000_cs.cOndrej Zary2011-07-051-7/+0
| | * staging: ft1000-pcmcia: remove custom defines for standard typesOndrej Zary2011-07-053-105/+92
| | * staging: ft1000-pcmcia: remove unused fields from struct ft1000_infoOndrej Zary2011-07-053-51/+15
| | * staging: ft1000-pcmcia: remove firmware download typedefsOndrej Zary2011-07-051-18/+18
| | * staging: ft1000-pcmcia: delete local_info_t typedefOndrej Zary2011-07-051-24/+5
| | * staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefsOndrej Zary2011-07-051-5/+0
| | * staging: ft1000-pcmcia: remove FT1000_INFO typedefsOndrej Zary2011-07-054-42/+42
| | * staging: ft1000-pcmcia: remove PROV_RECORD typedefsOndrej Zary2011-07-053-10/+10
| | * staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefsOndrej Zary2011-07-051-10/+0
| | * staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefsOndrej Zary2011-07-051-8/+0
| | * staging: ft1000-pcmcia: remove DSPINITMSG typedefsOndrej Zary2011-07-052-5/+5
| | * staging: ft1000-pcmcia: delete unused TIMEMSG typedefsOndrej Zary2011-07-051-7/+0
| | * staging: ft1000-pcmcia: remove MEDIAMSG typedefsOndrej Zary2011-07-052-4/+4
| | * staging: ft1000-pcmcia: remove DRVMSG typedefsOndrej Zary2011-07-053-6/+6
| | * staging: ft1000-pcmcia: remove PSEUDO_HDR typedefsOndrej Zary2011-07-053-22/+22
| | * staging: ft1000-pcmcia: get rid of ft1000_dev.hOndrej Zary2011-07-054-68/+10
| | * staging: ft1000-pcmcia: delete ft1000.confOndrej Zary2011-07-051-14/+0
| | * staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabledOndrej Zary2011-07-051-2/+0
| | * staging: ft1000-pcmcia: don't crash on loadOndrej Zary2011-07-051-3/+1
| |/ |/|
| * netdevice: Kill 'feature' test macros.David S. Miller2011-07-121-9/+0
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2011-05-241-1/+1
|\
| * staging: pcmcia: Convert pcmcia_device_id declarations to constJoe Perches2011-05-061-1/+1
* | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-05-232-147/+30
|\ \ | |/ |/|
| * staging: ft1000: Removed unused variable InterruptsEnabled.Marek Belisko2011-05-032-2/+0
| * staging: ft1000: Remove unused variable CurrentInterruptEnableMask.Marek Belisko2011-05-032-2/+0
| * staging: ft1000: Remove unused variable DSPResetNum.Marek Belisko2011-05-032-3/+0
| * staging: ft1000: Remove unused variable ASICResetNum.Marek Belisko2011-05-032-4/+0
| * staging: ft1000: Remove unused variables in ft1000_info.Marek Belisko2011-05-031-13/+0
| * staging: ft1000: Remove unused declaration in ft1000_usb.h.Marek Belisko2011-05-031-2/+0
| * staging:ft1000: Remove dead code in ft1000_hw.cMarek Belisko2011-04-201-121/+30
* | staging: ft1000: Remove unnecessary EXPORT_SYMBOLsJeff Mahoney2011-04-252-7/+0
|/
* Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-04-071-39/+39
|\
| * staging: ft1000-pcmcia: Fix ft1000_dnld() to work also on 64bit architectures.pixo2011-04-041-39/+39
* | Fix common misspellingsLucas De Marchi2011-03-316-38/+38
|/