Linus Torvalds
3516c6a8dc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
Staging: serqt_usb: fix build due to proc tty changes
Staging: serqt_usb: fix checkpatch errors
Staging: serqt_usb: add TODO file
Staging: serqt_usb: Lindent the code
Staging: add USB serial Quatech driver
staging: document that the wifi staging drivers a bit better
Staging: echo cleanup
Staging: BUG to BUG_ON changes
Staging: remove some pointless conditionals before kfree_skb()
Staging: line6: fix build error, select SND_RAWMIDI
Staging: line6: fix checkpatch errors in variax.c
Staging: line6: fix checkpatch errors in toneport.c
Staging: line6: fix checkpatch errors in pcm.c
Staging: line6: fix checkpatch errors in midibuf.c
Staging: line6: fix checkpatch errors in midi.c
Staging: line6: fix checkpatch errors in dumprequest.c
Staging: line6: fix checkpatch errors in driver.c
Staging: line6: fix checkpatch errors in audio.c
Staging: line6: fix checkpatch errors in pod.c
...
2009-04-05 11:06:45 -07:00
Stoyan Gaydarov
2961f24f78
Staging: BUG to BUG_ON changes
...
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:26 -07:00
Greg Kroah-Hartman
0191492309
Staging: comedi: fix 64bit build errors
...
This patch fixes the 64bit build errors in the comedi code.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
180027136b
Staging: comedi: Remove CHAR, *PCHAR, and *PCSTR typedefs in addi-data
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
3019b4106b
Staging: comedi: Remove use of VOID typedef in addi-data
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
63aa142aca
Staging: comedi: Remove me4000_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
126974dc8c
Staging: comedi: Remove me4000_cnt_context_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
ff585603bd
Staging: comedi: Remove me4000_dio_context_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
8b95a0e17f
Staging: comedi: Remove me4000_ai_context_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
21921108be
Staging: comedi: Remove me4000_ao_context_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:18 -07:00
Bill Pemberton
27f4caaa3b
Staging: comedi: Remove me4000_board_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
79dcd04224
Staging: comedi: Remove me4000_cnt_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
e81d65b30c
Staging: comedi: Remove me4000_dio_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
0c18e8c046
Staging: comedi: Remove me4000_ai_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
8d95123295
Staging: comedi: Remove me4000_ao_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
05d21f4af4
Staging: comedi: Remove das08_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
2e93aa5b5b
Staging: comedi: Remove nidio96_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
30570f0dee
Staging: comedi: ni_daq_700.c: Remove local_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
4cab374073
Staging: comedi: Remove dio700_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
8c8a28852b
Staging: comedi: Remove atmio16d_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
01983c39f0
Staging: comedi: Remove atao_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:17 -07:00
Bill Pemberton
92b635c5be
Staging: comedi: Remove a2150_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
43313b0734
Staging: comedi: Remove ni_670x_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
b3be94eade
Staging: comedi: Remove ni_660x_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
5079281313
Staging: comedi: Remove ni_660x_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
251411cf05
Staging: comedi: Remove NI_660x_Register typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
6179e3e9bb
Staging: comedi: Remove ni_65xx_subdevice_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
47c30a2cc3
Staging: comedi: Remove ni_65xx_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
f4c6b31958
Staging: comedi: Remove ni6527_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
97070b32a8
Staging: comedi: comedi: remove C99 comments in skel.c
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
450032a318
Staging: comedi: Remove pcidas64_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
222ab1bc78
Staging: comedi: Remove pcidas64_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
675935dd95
Staging: comedi: Remove hw_fifo_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:16 -07:00
Bill Pemberton
4a5a33b622
Staging: comedi: Remove 2.4 irqreturn_t compatibility in comedi/interrupt.h
...
This allows the comedi driver to build after commit bedd3..058bb
is applied.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Reported-by: Sachin Sant <sachinp@in.ibm.com>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
ab64f66341
Staging: comedi: quatech_daqp_cs: Remove local_info_t typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
e21ffa44f5
Staging: comedi: serial2002: Remove serial2002_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
404d108d8f
Staging: comedi: skel.c: Remove skel_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
1de6a6fd5b
Staging: comedi: rti800: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
180089a896
Staging: comedi: pcm3724: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
1c7f40d91b
Staging: comedi: pcl816: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
fb1314de41
Staging: comedi: pcl812: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:15 -07:00
Bill Pemberton
292090dcc8
Staging: comedi: pcl730: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
747887a621
Staging: comedi: pcl726: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
01820e023e
Staging: comedi: pcl724: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
6445296e98
Staging: comedi: pcl711: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
42f1884d06
Staging: comedi: dt2811: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
938f185d4e
Staging: comedi: das800: Remove das800_board typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
b90c76fd78
Staging: comedi: cb_pcimdas: Remove timer_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
502dd07999
Staging: comedi: acl7225b: Remove boardtype typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00
Bill Pemberton
fe0ff17532
Staging: comedi: Remove pcl816_private typedef
...
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:13 -07:00