git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
media
/
video
/
se401.h
diff --git
a/drivers/usb/media/se401.h
b/drivers/media/video/se401.h
similarity index 97%
rename from
drivers/usb/media/se401.h
rename to
drivers/media/video/se401.h
index
2e5846f
..
c0891b3
100644
(file)
--- a/
drivers/usb/media/se401.h
+++ b/
drivers/media/video/se401.h
@@
-4,7
+4,9
@@
#include <asm/uaccess.h>
#include <linux/videodev.h>
#include <asm/uaccess.h>
#include <linux/videodev.h>
+#include <media/v4l2-common.h>
#include <linux/smp_lock.h>
#include <linux/smp_lock.h>
+#include <linux/mutex.h>
#define se401_DEBUG /* Turn on debug messages */
#define se401_DEBUG /* Turn on debug messages */
@@
-176,7
+178,7
@@
struct usb_se401 {
int expose_m;
int expose_l;
int resetlevel;
int expose_m;
int expose_l;
int resetlevel;
-
+
int enhance;
int format;
int enhance;
int format;
@@
-189,7
+191,7
@@
struct usb_se401 {
int maxframesize;
int cframesize; /* current framesize */
int maxframesize;
int cframesize; /* current framesize */
- struct
semaphore
lock;
+ struct
mutex
lock;
int user; /* user count for exclusive use */
int removed; /* device disconnected */
int user; /* user count for exclusive use */
int removed; /* device disconnected */
@@
-199,12
+201,12
@@
struct usb_se401 {
struct urb *urb[SE401_NUMSBUF];
struct urb *inturb;
struct urb *urb[SE401_NUMSBUF];
struct urb *inturb;
-
+
int button;
int buttonpressed;
int curframe; /* Current receiving frame */
int button;
int buttonpressed;
int curframe; /* Current receiving frame */
- struct se401_frame frame[SE401_NUMFRAMES];
+ struct se401_frame frame[SE401_NUMFRAMES];
int readcount;
int framecount;
int error;
int readcount;
int framecount;
int error;