diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
| commit | 43a3beb6da994549ec28a9f31727b997a025f958 (patch) | |
| tree | 9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 /drivers/staging/easycap/easycap.h | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
| parent | 68cf162a1af23c35db8e3b78659c99196c9882ff (diff) | |
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap.h')
| -rw-r--r-- | drivers/staging/easycap/easycap.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index 22b24b6c5a5..7b256a948c2 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -324,13 +324,6 @@ struct easycap { int lost[INPUT_MANY]; int merit[180]; - struct timeval timeval0; - struct timeval timeval1; - struct timeval timeval2; - struct timeval timeval3; - struct timeval timeval6; - struct timeval timeval7; - struct timeval timeval8; long long int dnbydt; int video_interface; @@ -543,10 +536,6 @@ int read_vt(struct usb_device *, u16); int write_vt(struct usb_device *, u16, u16); int isdongle(struct easycap *); /*---------------------------------------------------------------------------*/ -struct signed_div_result { - long long int quotient; - unsigned long long int remainder; -} signed_div(long long int, long long int); /*---------------------------------------------------------------------------*/ |