1 diff -urN linux-2.6.7.orig/drivers/usb/media/pwc-if.c linux-2.6.7/drivers/usb/media/pwc-if.c
2 --- linux-2.6.7.orig/drivers/usb/media/pwc-if.c 2004-07-11 11:38:13.671862968 +0200
3 +++ linux-2.6.7/drivers/usb/media/pwc-if.c 2004-07-05 22:03:39.000000000 +0200
6 static int pwc_video_open(struct inode *inode, struct file *file);
7 static int pwc_video_close(struct inode *inode, struct file *file);
8 -static ssize_t pwc_video_read(struct file *file, char __user *buf,
9 +static ssize_t pwc_video_read(struct file *file, char *buf,
10 size_t count, loff_t *ppos);
11 static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
12 static int pwc_video_ioctl(struct inode *inode, struct file *file,
14 device is tricky anyhow.
17 -static ssize_t pwc_video_read(struct file *file, char __user *buf,
18 +static ssize_t pwc_video_read(struct file *file, char *buf,
19 size_t count, loff_t *ppos)
21 struct video_device *vdev = file->private_data;
22 @@ -1801,19 +1801,6 @@
23 else if (vendor_id == 0x06be) {
26 - /* Basicly the same as the Sotec Afina Eye */
27 - Info("AME CU-001 USB webcam detected.\n");
28 - name = "AME CU-001";
36 - else if (vendor_id == 0x06be) {
37 - switch(product_id) {
39 /* This is essentially the same cam as the Sotec Afina Eye */
40 Info("AME Co. Afina Eye USB webcam detected.\n");
41 name = "AME Co. Afina Eye";
42 diff -urN linux-2.6.7.orig/drivers/usb/media/pwc-uncompress.h linux-2.6.7/drivers/usb/media/pwc-uncompress.h
43 --- linux-2.6.7.orig/drivers/usb/media/pwc-uncompress.h 2004-07-11 11:38:13.706857648 +0200
44 +++ linux-2.6.7/drivers/usb/media/pwc-uncompress.h 2004-07-05 22:03:39.000000000 +0200
46 int type; /* type of camera (645, 680, etc) */
47 int table_size; /* memory needed */
49 - void (* init)(int type, int release, void *buffer, void *table); /* Initialization routine; should be called after each set_video_mode */
50 - void (* exit)(void); /* Cleanup routine */
51 - void (* decompress)(struct pwc_coord *image, struct pwc_coord *view,
52 - struct pwc_coord *offset,
53 + asmlinkage void (* init)(int type, int release, void *buffer, void *table); /* Initialization routine; should be called after each set_video_mode */
54 + asmlinkage void (* exit)(void); /* Cleanup routine */
55 + asmlinkage void (* decompress)(struct pwc_coord *image, struct pwc_coord *view, struct pwc_coord *offset,
56 void *src, void *dst, int flags,
57 void *table, int bandlength);
58 void (* lock)(void); /* make sure module cannot be unloaded */