git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/log

]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/log

projects / mirror_ubuntu-eoan-kernel.git / log

Greg Kroah-Hartman [Mon, 27 Apr 2009 22:15:30 +0000 (15:15 -0700)]

Staging: comedi: remove some RT code that lingered

This removes some pieces of RT code that was part of the main code
paths.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Greg Kroah-Hartman [Mon, 27 Apr 2009 22:14:34 +0000 (15:14 -0700)]

Staging: comedi: remove RT code

This removes the unused RT code from the comedi subsystem.

A lot of drivers needed to then include interrupt.h on their own, as they
were picking it up through the comedi_rt.h inclusion.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Greg Kroah-Hartman [Mon, 27 Apr 2009 21:44:31 +0000 (14:44 -0700)]

Staging: comedi: remove comedi-specific wrappers

There are a number of comedi "wrappers" for some RT functions that are
about to go away. This patch removes all of the wrapper calls within
the comedi drivers and core in order to prepare for removing the RT
comedi code.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bernd Porr [Fri, 17 Apr 2009 20:21:46 +0000 (21:21 +0100)]

Staging: comedi: convert usbdux* to use firmware_request

The firmware is now in the linux-firmware tree, so we can move these two
drivers to use the proper request_firmware infrastructure.

From: Bernd Porr <BerndPorr@f2s.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:58 +0000 (15:54 -0400)]

Staging: comedi: move while to same line as } in do loops

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:57 +0000 (15:54 -0400)]

Staging: comedi: comment out useless if

This if test doesn't do anything, so comment it out.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:56 +0000 (15:54 -0400)]

Staging: comedi: make use of ARRAY_SIZE macro

Replace instances of computing number of elements in an array with
sizeof(foo)/sizeof(struct footype) with the ARRAY_SIZE macro.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:55 +0000 (15:54 -0400)]

Staging: comedi: more fix the way structs are initialized.

Change from the foo: bar format to the .foo = bar format.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:54 +0000 (15:54 -0400)]

Staging: comedi: more fix "foo * bar" should be "foo *bar"

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:53 +0000 (15:54 -0400)]

Staging: comedi: remove space after ampersand

Change calses of & foo to &foo as suggested by checkpatch.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 19:54:52 +0000 (15:54 -0400)]

Staging: comedi: more remove C99 comments

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 01:11:49 +0000 (21:11 -0400)]

Staging: comedi: fix the way structs are initialized.

Change from the foo: bar format to the .foo = bar format.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 01:11:48 +0000 (21:11 -0400)]

Staging: comedi: Remove parens around return values

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 23 Apr 2009 01:11:47 +0000 (21:11 -0400)]

Staging: comedi: remove assignment in conditionals

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Roel Kluin [Thu, 23 Apr 2009 10:23:14 +0000 (12:23 +0200)]

Staging: comedi: non working tests on unsigned cmd->convert_arg

Remove tests for negative unsigned.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Manuel Gebele [Sun, 19 Apr 2009 12:46:01 +0000 (14:46 +0200)]

Staging: comedi: Makefile changes

this patch will sort the 'Comedi USB drivers' section in the
staging/comedi/drivers/Makefile in alphabetical order, and add the
vmk80xx.c driver to the build.

From: Manuel Gebele <forensixs@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Greg Kroah-Hartman [Wed, 22 Apr 2009 17:29:33 +0000 (10:29 -0700)]

Staging: comedi: vmk80xx.c: get the driver to build properly

There have been changes in the comedi core, this fixes the vmk80xx.c
driver to work properly with them, so it now will build properly.

Cc: Manuel Gebele <forensixs@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Manuel Gebele [Wed, 22 Apr 2009 17:28:18 +0000 (10:28 -0700)]

Staging: comedi: add vmk80xx USB driver

The k80xx module was completely revised again. The update contains the
following new main features:
- support for digital input
- support for digital output
- support for pulse counters
- support up to 16 boards (by the way, the windows driver and the k8055
library (libk8055) has support for only 4 boards)

The driver can now manage all features what the board has to offer:
- analog input/output
- digital input/output
- pulse counters (read, reset, set debounce time)

I've also fixed some mistaken in the drivers source code/logic.

By testing all of the driver features i got no errors or something else.
The driver works fine....

From: Manuel Gebele <forensixs@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 9 Apr 2009 20:07:27 +0000 (16:07 -0400)]

Staging: Comedi: change space indentation to tabs

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 9 Apr 2009 20:07:21 +0000 (16:07 -0400)]

Staging Comedi: fix spacing around parens

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 9 Apr 2009 20:07:16 +0000 (16:07 -0400)]

Staging: comedi: Add spaces after commas

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Thu, 9 Apr 2009 20:07:03 +0000 (16:07 -0400)]

Staging: comedi: fix "foo * bar" should be "foo *bar"

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Huang Weiyi [Mon, 6 Apr 2009 09:20:17 +0000 (17:20 +0800)]

Staging: comedi: remove dupilcated #include

Remove dupilcated #include in drivers/staging/comedi/drivers/8253.h.

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Alessio Igor Bogani [Tue, 24 Mar 2009 18:30:57 +0000 (19:30 +0100)]

Staging: comedi: replace __FUNCTION__ usages

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Frank Mori Hess [Tue, 14 Apr 2009 16:59:47 +0000 (12:59 -0400)]

Staging: comedi: jr3_pci: Use struct device from pci_dev for firmware loading.

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Frank Mori Hess [Tue, 14 Apr 2009 15:21:41 +0000 (11:21 -0400)]

Staging: comedi: Added sysfs attribute files for setting and querying subdevice buffer sizes.

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Ian Abbott [Tue, 14 Apr 2009 15:06:27 +0000 (11:06 -0400)]

Staging: comedi: amplc_pc236: Corrected documentation.

Interrupt is triggered by rising edge on port C bit 3 (not bit 7).

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Ian Abbott [Tue, 14 Apr 2009 15:04:24 +0000 (11:04 -0400)]

Staging: comedi: Undo stupid commit made 3 months ago

Undo stupid commit made 3 months ago :
"Fix redefinition of macro comedi_rt_task_context_t".
It wasn't being redefined, it was being defined for RTLinux.

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Ian Abbott [Tue, 14 Apr 2009 15:01:50 +0000 (11:01 -0400)]

Staging: comedi: Work around malformed RTAI_VERSION_CODE.

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Frank Mori Hess [Tue, 14 Apr 2009 14:55:09 +0000 (10:55 -0400)]

Staging: Comedi: ni_600x: Added support for comedi_poll.

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Ian Abbott [Tue, 14 Apr 2009 14:39:53 +0000 (10:39 -0400)]

Staging: comedi: pcl818: Tidy up AI command after channel dropout or similar error.

It was causing subsequent commands to fail with -EBUSY.

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Ian Abbott [Tue, 14 Apr 2009 14:33:42 +0000 (10:33 -0400)]

Staging: comedi: pcl818: Fix option handling for FIFO mode (hopefully!).

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Frank Mori Hess [Mon, 6 Apr 2009 18:01:19 +0000 (14:01 -0400)]

Staging: comedi: Fixed Kconfig option for COMEDI_PCMCIA_DRIVERS

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Greg Kroah-Hartman [Fri, 17 Apr 2009 16:51:01 +0000 (09:51 -0700)]

Staging: comedi: set PCI and PCMCIA defines

The comedi drivers are looking for CONFIG_COMEDI_PCI and
CONFIG_COMEDI_PCMCIA, not the current config items. This creates a
define so that things build properly when these options are selected.
Long term goal is to fix up the drivers to not need any defines.

Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Greg Kroah-Hartman [Fri, 17 Apr 2009 16:50:08 +0000 (09:50 -0700)]

Staging: comedi: fix build errors in pcmcia comedi drivers

This fixes a few minor build errors that were previously undetected in
the comedi pcmcia drivers.

Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Ian Abbott [Mon, 6 Apr 2009 19:10:30 +0000 (15:10 -0400)]

Staging: comedi: 'pcmcia_parse_tuple()' now has two arguments, not three.

This fixes the build error in the cv_das16_cs driver

From: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Frank Mori Hess [Mon, 6 Apr 2009 19:13:04 +0000 (15:13 -0400)]

Staging: comedi: Finish removing ni_private typedef

This fixes compilation of ni_mio_cs.c that was broken.

Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:34 +0000 (11:29 -0400)]

Staging: comedi: Remove C99 comments

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Jiri Slaby [Thu, 26 Mar 2009 08:34:06 +0000 (09:34 +0100)]

staging: comedi, remove interrupt.h

Remove interrupt wraparound. Use defines from linux/interrupt.h
instead.

Change also parameter types of functions taking ISR to irq_handler_t.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:31:27 +0000 (11:31 -0400)]

Staging: comedi: remove C99 comments in s526.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:31:22 +0000 (11:31 -0400)]

Staging: comedi: remove C99 comments in pcl816.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:31:16 +0000 (11:31 -0400)]

Staging: comedi: remove C99 comments in pcl724.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:31:11 +0000 (11:31 -0400)]

Staging: comedi: remove C99 comments in ni_labpc.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:31:06 +0000 (11:31 -0400)]

Staging: comedi: remove C99 comments in ni_at_a2150.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:31:00 +0000 (11:31 -0400)]

Staging: comedi: remove C99 comments in mpc624.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:55 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in gsc_hpdi.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:50 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in cb_pcimdas.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:44 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in cb_pcidas.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:39 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in cb_pcidas64.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:34 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in c6xdigio.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:28 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in adv_pci1723.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:23 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in adl_pci9118.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:18 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in adl_pci6208.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:12 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in hwdrv_apci3120.c

This replaces C99 comments with traditional C comments. This
also removes 3 blocks of code that were already commented out.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:07 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in hwdrv_apci3200.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:30:01 +0000 (11:30 -0400)]

Staging: comedi: remove C99 comments in hwdrv_apci1564.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:56 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in APCI1710_Pwm.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:51 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in hwdrv_apci1500.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:45 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in pcl818.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:40 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in das1800.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:29 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in APCI1710_82x54.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:23 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in acl7225b.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Fri, 27 Mar 2009 15:29:18 +0000 (11:29 -0400)]

Staging: comedi: remove C99 comments in 8253.h

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:30 +0000 (11:06 -0400)]

Staging: comedi: Remove str_AnalogInputHeader typedef in addi-data/addi_eeprom.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:07:01 +0000 (11:07 -0400)]

Staging: comedi: Remove labpc_private typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:56 +0000 (11:06 -0400)]

Staging: comedi: Remove labpc_board_struct typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:51 +0000 (11:06 -0400)]

Staging: comedi: Remove str_ADDIDATA_RTDStruct typedef in addi-data/hwdrv_apci3200

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:45 +0000 (11:06 -0400)]

Staging: comedi: Remove str_BoardInfos typedef in addi-data/hwdrv_apci3200

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:40 +0000 (11:06 -0400)]

Staging: comedi: Remove str_Module typedef in addi-data/hwdrv_apci3200.h

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:35 +0000 (11:06 -0400)]

Staging: comedi: Remove str_AnalogReadInformation typedef in addi-data/hwdrv_apci3120.h

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:19 +0000 (11:06 -0400)]

Staging: comedi: Remove str_TimerMainHeader typedef in addi-data/addi_eeprom.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:13 +0000 (11:06 -0400)]

Staging: comedi: Remove str_TimerDetails typedef in addi-data/addi_eeprom.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:08 +0000 (11:06 -0400)]

Staging: comedi: Remove str_DigitalOutputHeader typedef in addi-data/addi_eeprom.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:06:03 +0000 (11:06 -0400)]

Staging: comedi: Remove str_DigitalInputHeader typedef in addi-data/addi_eeprom.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:57 +0000 (11:05 -0400)]

Staging: comedi: Remove str_MainHeader typedef in addi-data/addi_eeprom.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:52 +0000 (11:05 -0400)]

Staging: comedi: Remove addi_private typedef in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:47 +0000 (11:05 -0400)]

Staging: comedi: Remove str_ModuleInfo typedef in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:41 +0000 (11:05 -0400)]

Staging: comedi: Remove boardtype typedef in addi-data

typedef for boardtype removed and struct renamed to
addi_board

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:36 +0000 (11:05 -0400)]

Staging: comedi: Remove PCRANGE typedef in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:30 +0000 (11:05 -0400)]

Staging: comedi: Remove ULONG_PTR typedef in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:25 +0000 (11:05 -0400)]

Staging: comedi: Remove DWORD and *PDWORD typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:20 +0000 (11:05 -0400)]

Staging: comedi: Remove ULONG and *PULONG typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:14 +0000 (11:05 -0400)]

Staging: comedi: Remove LONG and *PLONG typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:09 +0000 (11:05 -0400)]

Staging: comedi: Remove UINT and *PUINT typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:05:03 +0000 (11:05 -0400)]

Staging: comedi: Remove INT and *PINT typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:58 +0000 (11:04 -0400)]

Staging: comedi: Remove WORD and *PWORD typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:52 +0000 (11:04 -0400)]

Staging: comedi: Remove USHORT and *PUSHORT typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:47 +0000 (11:04 -0400)]

Staging: comedi: Remove SHORT and *PSHORT typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:41 +0000 (11:04 -0400)]

Staging: comedi: Remove BYTE and *PBYTE typedefs in addi-data

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:36 +0000 (11:04 -0400)]

Staging: comedi: Remove local_info_t typedef in ni_daq_dio24

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:30 +0000 (11:04 -0400)]

Staging: comedi: Remove dio24_board_struct typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:25 +0000 (11:04 -0400)]

Staging: comedi: Remove local_info_t typedef in ni_labpc_cs

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:20 +0000 (11:04 -0400)]

Staging: comedi: Remove ni_private typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Bill Pemberton [Wed, 25 Mar 2009 15:04:14 +0000 (11:04 -0400)]

Staging: comedi: Remove ni_board typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Greg Kroah-Hartman [Fri, 5 Jun 2009 18:23:47 +0000 (11:23 -0700)]

Staging: add mailing list address for staging tree

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit | commitdiff | tree

Linus Torvalds [Thu, 18 Jun 2009 21:07:46 +0000 (14:07 -0700)]

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: clean up jbd2_journal_try_to_free_buffers()
  ext4: Don't update ctime for non-extent-mapped inodes
  ext4: Fix up whitespace issues in fs/ext4/inode.c
  ext4: Fix 64-bit block type problem on 32-bit platforms
  ext4: teach the inode allocator to use a goal inode number
  ext4: Use a hash of the topdir directory name for the Orlov parent group
  ext4: document the "abort" mount option
  ext4: move the abort flag from s_mount_opts to s_mount_flags
  ext4: update the s_last_mounted field in the superblock
  ext4: change s_mount_opt to be an unsigned int
  ext4: online defrag -- Add EXT4_IOC_MOVE_EXT ioctl
  ext4: avoid unnecessary spinlock in critical POSIX ACL path
  ext3: avoid unnecessary spinlock in critical POSIX ACL path
  ext4: convert instrumentation from markers to tracepoints
  jbd2: convert instrumentation from markers to tracepoints

commit | commitdiff | tree

Linus Torvalds [Thu, 18 Jun 2009 21:07:35 +0000 (14:07 -0700)]

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
  sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
  sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
  sh: remove stray markers.
  sh: defconfig updates.
  sh: pci: Initial PCI-Express support for SH7786 Urquell board.
  sh: Generic HAVE_PERF_COUNTER support.
  SH: convert migor to soc-camera as platform-device
  SH: convert ap325rxa to soc-camera as platform-device
  soc-camera: unify i2c camera device platform data
  sh: add platform data for r8a66597-hcd in setup-sh7723
  sh: add platform data for r8a66597-hcd in setup-sh7366
  sh: x3proto: add platform data for r8a66597-hcd
  sh: highlander: add platform data for r8a66597-hcd
  sh: sh7785lcr: add platform data for r8a66597-hcd
  sh: turn off irqs when disabling CMT/TMU timers
  sh: use kzalloc() for cpg clocks
  sh: unbreak WARN_ON()
  sh: Use generic atomic64_t implementation.
  sh: Revised clock function in highlander
  sh: Update r7780mp defconfig
  ...

commit | commitdiff | tree

Linus Torvalds [Thu, 18 Jun 2009 21:07:15 +0000 (14:07 -0700)]

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck

commit | commitdiff | tree

Linus Torvalds [Thu, 18 Jun 2009 20:14:10 +0000 (13:14 -0700)]

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] hpwdt: Add NMI sourcing
  [WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue.
  [WATCHDOG] iTCO_wdt: fix memory corruption when RCBA is disabled by hardware
  [WATCHDOG] Correct WDIOF_MAGICCLOSE flag
  [WATCHDOG] move platform probe and remove function to devinit and devexit
  [WATCHDOG] Some more general cleanup
  [WATCHDOG] iTCO_wdt: Cleanup code

commit | commitdiff | tree

Benjamin Herrenschmidt [Thu, 18 Jun 2009 03:24:12 +0000 (13:24 +1000)]

mm: Extend gfp masking to the page allocator

The page allocator also needs the masking of gfp flags during boot,
so this moves it out of slab/slub and uses it with the page allocator
as well.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Ubuntu Eoan Linux kernel mirror

RSS Atom