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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
video
/
em28xx
/
em28xx.h
diff --git
a/drivers/media/video/em28xx/em28xx.h
b/drivers/media/video/em28xx/em28xx.h
index
e1ddc2f
..
33de9d8
100644
(file)
--- a/
drivers/media/video/em28xx/em28xx.h
+++ b/
drivers/media/video/em28xx/em28xx.h
@@
-27,7
+27,6
@@
#include <linux/videodev.h>
#include <linux/i2c.h>
#include <linux/videodev.h>
#include <linux/i2c.h>
-#include <linux/mutex.h>
#include <media/ir-kbd-i2c.h>
/* Boards supported by driver */
#include <media/ir-kbd-i2c.h>
/* Boards supported by driver */
@@
-42,10
+41,6
@@
#define EM2800_BOARD_LEADTEK_WINFAST_USBII 7
#define EM2800_BOARD_KWORLD_USB2800 8
#define EM2820_BOARD_PINNACLE_DVC_90 9
#define EM2800_BOARD_LEADTEK_WINFAST_USBII 7
#define EM2800_BOARD_KWORLD_USB2800 8
#define EM2820_BOARD_PINNACLE_DVC_90 9
-#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 10
-#define EM2880_BOARD_TERRATEC_HYBRID_XS 11
-#define EM2820_BOARD_KWORLD_PVRTV2800RF 12
-#define EM2880_BOARD_TERRATEC_PRODIGY_XS 13
#define UNSET -1
#define UNSET -1
@@
-214,7
+209,6
@@
struct em28xx {
/* generic device properties */
char name[30]; /* name (including minor) of the device */
int model; /* index in the device_data struct */
/* generic device properties */
char name[30]; /* name (including minor) of the device */
int model; /* index in the device_data struct */
- int devno; /* marks the number of this device */
unsigned int is_em2800;
int video_inputs; /* number of video inputs */
struct list_head devlist;
unsigned int is_em2800;
int video_inputs; /* number of video inputs */
struct list_head devlist;
@@
-262,7
+256,7
@@
struct em28xx {
enum em28xx_stream_state stream;
enum em28xx_io_method io;
/* locks */
enum em28xx_stream_state stream;
enum em28xx_io_method io;
/* locks */
- struct
mutex
lock, fileop_lock;
+ struct
semaphore
lock, fileop_lock;
spinlock_t queue_lock;
struct list_head inqueue, outqueue;
wait_queue_head_t open, wait_frame, wait_stream;
spinlock_t queue_lock;
struct list_head inqueue, outqueue;
wait_queue_head_t open, wait_frame, wait_stream;
@@
-332,7
+326,6
@@
int em28xx_set_alternate(struct em28xx *dev);
/* Provided by em28xx-cards.c */
extern int em2800_variant_detect(struct usb_device* udev,int model);
/* Provided by em28xx-cards.c */
extern int em2800_variant_detect(struct usb_device* udev,int model);
-extern void em28xx_pre_card_setup(struct em28xx *dev);
extern void em28xx_card_setup(struct em28xx *dev);
extern struct em28xx_board em28xx_boards[];
extern struct usb_device_id em28xx_id_table[];
extern void em28xx_card_setup(struct em28xx *dev);
extern struct em28xx_board em28xx_boards[];
extern struct usb_device_id em28xx_id_table[];