dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/staging/comedi/drivers
History
Linus Torvalds b13bc8dda8 Staging tree patches for 3.6-rc1 
Here's the big staging tree merge for the 3.6-rc1 merge window.
 
 There are some patches in here outside of drivers/staging/, notibly the iio
 code (which is still stradeling the staging / not staging boundry), the pstore
 code, and the tracing code.  All of these have gotten ackes from the various
 subsystem maintainers to be included in this tree.  The pstore and tracing
 patches are related, and are coming here as they replace one of the android
 staging drivers.
 
 Otherwise, the normal staging mess.  Lots of cleanups and a few new drivers
 (some iio drivers, and the large csr wireless driver abomination.)
 
 Note, you will get a merge issue with the following files:
 	drivers/staging/comedi/drivers/s626.h
 	drivers/staging/gdm72xx/netlink_k.c
 both of which should be trivial for you to handle.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iEYEABECAAYFAlAQiD8ACgkQMUfUDdst+ykxhgCeMUjvc+1RTtSprzvkzpejgoUU
 6A4AnAleWMnkaCD8vruGnRdGl/Qtz51+
 =mN6M
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging tree patches from Greg Kroah-Hartman:
 "Here's the big staging tree merge for the 3.6-rc1 merge window.

  There are some patches in here outside of drivers/staging/, notibly
  the iio code (which is still stradeling the staging / not staging
  boundry), the pstore code, and the tracing code.  All of these have
  gotten acks from the various subsystem maintainers to be included in
  this tree.  The pstore and tracing patches are related, and are coming
  here as they replace one of the android staging drivers.

  Otherwise, the normal staging mess.  Lots of cleanups and a few new
  drivers (some iio drivers, and the large csr wireless driver
  abomination.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
drivers/staging/gdm72xx/netlink_k.c

* tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
  staging: csr: delete a bunch of unused library functions
  staging: csr: remove csr_utf16.c
  staging: csr: remove csr_pmem.h
  staging: csr: remove CsrPmemAlloc
  staging: csr: remove CsrPmemFree()
  staging: csr: remove CsrMemAllocDma()
  staging: csr: remove CsrMemCalloc()
  staging: csr: remove CsrMemAlloc()
  staging: csr: remove CsrMemFree() and CsrMemFreeDma()
  staging: csr: remove csr_util.h
  staging: csr: remove CsrOffSetOf()
  stating: csr: remove unneeded #includes in csr_util.c
  staging: csr: make CsrUInt16ToHex static
  staging: csr: remove CsrMemCpy()
  staging: csr: remove CsrStrLen()
  staging: csr: remove CsrVsnprintf()
  staging: csr: remove CsrStrDup
  staging: csr: remove CsrStrChr()
  staging: csr: remove CsrStrNCmp
  staging: csr: remove CsrStrCmp
  ...
 		2012-07-26 11:14:49 -07:00
..
addi-data staging: comedi: addi_data: remove pr_TTLRangelist 2012-07-16 19:19:35 -07:00
8253.h
…
8255.c staging: comedi: remove unneeded sanity check in insn_bits functions 2012-06-18 17:16:11 -07:00
8255.h staging: comedi: 8255: push out the 8255's private data variable rename 2012-06-13 17:19:15 -07:00
Makefile staging: comedi: split CONFIG_COMEDI_NI_TIO option 2012-06-26 15:10:56 -07:00
acl7225b.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
addi_apci_3xxx.c
…
addi_apci_16xx.c
…
addi_apci_035.c
…
addi_apci_1032.c
…
addi_apci_1500.c
…
addi_apci_1516.c
…
addi_apci_1564.c
…
addi_apci_1710.c
…
addi_apci_2016.c
…
addi_apci_2032.c
…
addi_apci_2200.c
…
addi_apci_3001.c
…
addi_apci_3120.c
…
addi_apci_3200.c
…
addi_apci_3300.c
…
addi_apci_3501.c
…
addi_apci_all.c
…
adl_pci6208.c staging: comedi: adl_pci6208: store the pci_dev in the comedi_device 2012-07-19 16:19:39 -07:00
adl_pci7230.c staging: comedi: adl_pci7230: remove the private data 2012-07-19 16:19:39 -07:00
adl_pci7296.c staging: comedi: adl_pci7296: remove the private data 2012-07-19 16:19:40 -07:00
adl_pci7432.c staging: comedi: adl_pci7432: remove the private data 2012-07-19 16:19:40 -07:00
adl_pci8164.c staging: comedi: adl_pci8164: remove the private data 2012-07-19 16:19:40 -07:00
adl_pci9111.c staging: comedi: adl_pci9111: store the pci_dev in the comedi_device 2012-07-19 16:19:40 -07:00
adl_pci9118.c staging: comedi: adl_pci9118: store the pci_dev in the comedi_device 2012-07-19 16:19:41 -07:00
adq12b.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
adv_pci1710.c staging: comedi: adv_pci1710: store the pci_dev in the comedi_device 2012-07-19 16:19:42 -07:00
adv_pci1723.c staging: comedi: adv_pci1723: store the pci_dev in the comedi_device 2012-07-19 16:19:41 -07:00
adv_pci_dio.c staging: comedi: adv_pci_dio: store the pci_dev in the comedi_device 2012-07-19 16:19:43 -07:00
aio_aio12_8.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
aio_iiro_16.c staging: comedi: aio_iiro_16: remove the private data 2012-07-19 16:51:40 -07:00
am9513.h
…
amcc_s5933.h
…
amplc_dio200.c staging: comedi: amplc_dio200: store the pci_dev in the comedi_device 2012-07-19 16:32:52 -07:00
amplc_pc236.c staging: comedi: amplc_pc236: store the pci_dev in the comedi_device 2012-07-19 16:32:53 -07:00
amplc_pc263.c staging: comedi: amplc_pc263: store the pci_dev in the comedi_device 2012-07-19 16:32:53 -07:00
amplc_pci224.c staging: comedi: amplc_pci224: store the pci_dev in the comedi_device 2012-07-19 16:32:53 -07:00
amplc_pci230.c staging: comedi: amplc_pci230: store the pci_dev in the comedi_device 2012-07-19 16:32:54 -07:00
c6xdigio.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
cb_das16_cs.c staging: comedi: cb_das16_cs: remove unneeded default case in analog in read 2012-06-26 15:36:10 -07:00
cb_pcidas.c staging: comedi: cb_pcidas: store the pci_dev in the comedi_device 2012-07-19 16:19:43 -07:00
cb_pcidas64.c staging: comedi: cb_pcidas64: store the pci_dev in the comedi_device 2012-07-19 16:32:54 -07:00
cb_pcidda.c staging: comedi: cb_pcidda: store the pci_dev in the comedi_device 2012-07-19 16:32:54 -07:00
cb_pcidio.c staging: comedi: cb_pcidio: remove the private data 2012-07-19 16:32:55 -07:00
cb_pcimdas.c staging: comedi: cb_pcimdas: store the pci_dev in the comedi_device 2012-07-19 16:32:56 -07:00
cb_pcimdda.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
comedi_bond.c staging: comedi: remove unneeded sanity check in insn_bits functions 2012-06-18 17:16:11 -07:00
comedi_fc.c
…
comedi_fc.h
…
comedi_parport.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
comedi_test.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
contec_pci_dio.c staging: comedi: contec_pci_dio: remove the private data 2012-07-19 16:32:57 -07:00
daqboard2000.c staging: comedi: daqboard2000: void *plx should be a void __iomem * 2012-07-19 16:32:57 -07:00
das08.c staging: comedi: das_08: absorb i8254_struct into the private data 2012-07-06 15:46:08 -07:00
das08.h staging: comedi: das_08: absorb i8254_struct into the private data 2012-07-06 15:46:08 -07:00
das08_cs.c staging: comedi: das08_cs: remove thisboard macro 2012-07-06 15:51:20 -07:00
das16.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
das16m1.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
das800.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
das1800.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
das6402.c staging: comedi: change device used in dev_...() calls 2012-06-18 17:13:06 -07:00
dmm32at.c staging: comedi: dmm32at: remove skel driver cut-and-paste comments 2012-07-06 15:51:22 -07:00
dt282x.c staging: comedi: dt282x: remove the outw wrapper macros 2012-07-16 19:08:22 -07:00
dt2801.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
dt2811.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
dt2814.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
dt2815.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
dt2817.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
dt3000.c staging: comedi: dt3000: store the pci_dev in the comedi_device 2012-07-19 16:51:36 -07:00
dt9812.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
dyna_pci10xx.c staging: comedi: dyna_pci10xx: fix detach 2012-07-19 16:51:38 -07:00
fl512.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
gsc_hpdi.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
icp_multi.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
icp_multi.h staging: comedi: remove private header comedi_pci.h 2012-06-04 20:24:43 -07:00
ii_pci20kc.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
jr3_pci.c staging: comedi: change device used in dev_...() calls 2012-06-18 17:13:06 -07:00
jr3_pci.h
…
ke_counter.c staging: comedi: ke_counter: remove the cnt_board_nbr macro 2012-07-19 16:51:38 -07:00
me4000.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
me4000.h staging: comedi: me4000: remove PDEBUG macro 2012-06-14 17:26:52 -07:00
me_daq.c staging: comedi: me_daq: store the pci_dev in the comedi_device 2012-07-19 16:51:39 -07:00
mite.c staging: comedi: remove private header comedi_pci.h 2012-06-04 20:24:43 -07:00
mite.h staging: comedi: mite: mite_io_addr and daq_io_addr are void __iomem * 2012-05-09 13:36:27 -07:00
mpc624.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
mpc8260cpm.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
multiq3.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_65xx.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_660x.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_670x.c staging: comedi: ni_670x: removve unused 'ao_bits' 2012-07-06 15:46:07 -07:00
ni_6527.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_at_a2150.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
ni_at_ao.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_atmio.c staging: comedi: cleanup all the comedi_driver 'detach' functions 2012-05-18 17:29:55 -07:00
ni_atmio16d.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_daq_700.c staging: comedi: ni_daq_700: refactor the pcmcia attach/detach 2012-06-22 20:55:10 -07:00
ni_daq_dio24.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
ni_labpc.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
ni_labpc.h staging: comedi: cleanup all the comedi_driver 'detach' functions 2012-05-18 17:29:55 -07:00
ni_labpc_cs.c staging: comedi: cleanup all the comedi_driver 'detach' functions 2012-05-18 17:29:55 -07:00
ni_mio_common.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_mio_cs.c staging: comedi: cleanup all the comedi_driver 'detach' functions 2012-05-18 17:29:55 -07:00
ni_pcidio.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
ni_pcimio.c staging: comedi: change device used in dev_...() calls 2012-06-18 17:13:06 -07:00
ni_stc.h
…
ni_tio.c staging: Remove unnecessary semicolons when switch (foo) {...}; 2011-04-25 16:58:35 -07:00
ni_tio.h
…
ni_tio_internal.h staging: comedi: ni_tio_internal.h: checkpatch.pl cleanups 2012-04-20 08:29:54 -07:00
ni_tiocmd.c
…
pcl711.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcl724.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
pcl725.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcl726.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcl730.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcl812.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcl816.c staging: comedi: pcl816: remove unneeded tests in pcl816_ai_cmdtest 2012-06-14 17:25:47 -07:00
pcl818.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcm3724.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
pcm3730.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
pcm_common.c
…
pcm_common.h
…
pcmad.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
pcmda12.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
pcmmio.c staging: comedi: pcmmio: quiet NULL pointer sparse noise 2012-06-18 17:39:21 -07:00
pcmuio.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
plx9052.h
…
plx9080.h
…
poc.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
quatech_daqp_cs.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
rtd520.c staging: comedi: rtd520: store the pci_dev in the comedi_device 2012-07-19 16:51:39 -07:00
rtd520.h
…
rti800.c staging: comedi: fix return value for insn_bits functions 2012-06-18 17:17:10 -07:00
rti802.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
s526.c staging: comedi: s526: remove unused variables in the private data 2012-07-19 16:51:40 -07:00
s626.c staging: comedi: s626: fix the number of dio channels 2012-07-06 15:56:14 -07:00
s626.h Staging tree patches for 3.6-rc1 2012-07-26 11:14:49 -07:00
serial2002.c staging: comedi: change device used in dev_...() calls 2012-06-18 17:13:06 -07:00
skel.c staging: comedi: remove CONFIG_COMEDI_PCI define 2012-06-20 13:00:42 -07:00
ssv_dnp.c staging: comedi: ssv_dnp: remove empty private data 2012-06-20 16:11:34 -07:00
unioxx5.c staging: comedi: propogate error code from comedi_alloc_subdevices 2012-06-12 14:44:04 -07:00
usbdux.c staging: comedi: usbdux: refactor init code 2012-06-20 13:04:50 -07:00
usbduxfast.c staging: comedi: usbduxfast: refactor init code 2012-06-20 13:04:50 -07:00
usbduxsigma.c staging: comedi: double unlock in usbduxsigma_attach() 2012-06-22 20:49:36 -07:00
vmk80xx.c staging: comedi: vmk80xx: refactor init code 2012-06-20 13:04:50 -07:00