diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /drivers/media/video/gspca/t613.c | |
parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/gspca/t613.c')
-rw-r--r-- | drivers/media/video/gspca/t613.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c index 00f47e463a0..91b555c34c6 100644 --- a/drivers/media/video/gspca/t613.c +++ b/drivers/media/video/gspca/t613.c | |||
@@ -1,12 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | *Notes: * t613 + tas5130A | ||
3 | * * Focus to light do not balance well as in win. | ||
4 | * Quality in win is not good, but its kinda better. | ||
5 | * * Fix some "extraneous bytes", most of apps will show the image anyway | ||
6 | * * Gamma table, is there, but its really doing something? | ||
7 | * * 7~8 Fps, its ok, max on win its 10. | ||
8 | * Costantino Leandro | ||
9 | * | ||
10 | * V4L2 by Jean-Francois Moine <http://moinejf.free.fr> | 2 | * V4L2 by Jean-Francois Moine <http://moinejf.free.fr> |
11 | * | 3 | * |
12 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
@@ -22,16 +14,22 @@ | |||
22 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
23 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | * | ||
18 | *Notes: * t613 + tas5130A | ||
19 | * * Focus to light do not balance well as in win. | ||
20 | * Quality in win is not good, but its kinda better. | ||
21 | * * Fix some "extraneous bytes", most of apps will show the image anyway | ||
22 | * * Gamma table, is there, but its really doing something? | ||
23 | * * 7~8 Fps, its ok, max on win its 10. | ||
24 | * Costantino Leandro | ||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #define MODULE_NAME "t613" | 27 | #define MODULE_NAME "t613" |
28 | |||
28 | #include "gspca.h" | 29 | #include "gspca.h" |
29 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 7) | ||
30 | static const char version[] = "2.1.7"; | ||
31 | 30 | ||
32 | #define MAX_GAMMA 0x10 /* 0 to 15 */ | 31 | #define MAX_GAMMA 0x10 /* 0 to 15 */ |
33 | 32 | ||
34 | /* From LUVCVIEW */ | ||
35 | #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3) | 33 | #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3) |
36 | 34 | ||
37 | MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>"); | 35 | MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>"); |
@@ -424,7 +422,6 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
424 | struct cam *cam; | 422 | struct cam *cam; |
425 | 423 | ||
426 | cam = &gspca_dev->cam; | 424 | cam = &gspca_dev->cam; |
427 | cam->dev_name = (char *) id->driver_info; | ||
428 | cam->epaddr = 0x01; | 425 | cam->epaddr = 0x01; |
429 | 426 | ||
430 | cam->cam_mode = vga_mode_t16; | 427 | cam->cam_mode = vga_mode_t16; |
@@ -998,9 +995,8 @@ static const struct sd_desc sd_desc = { | |||
998 | }; | 995 | }; |
999 | 996 | ||
1000 | /* -- module initialisation -- */ | 997 | /* -- module initialisation -- */ |
1001 | #define DVNM(name) .driver_info = (kernel_ulong_t) name | ||
1002 | static const __devinitdata struct usb_device_id device_table[] = { | 998 | static const __devinitdata struct usb_device_id device_table[] = { |
1003 | {USB_DEVICE(0x17a1, 0x0128), DVNM("XPX Webcam")}, | 999 | {USB_DEVICE(0x17a1, 0x0128)}, |
1004 | {} | 1000 | {} |
1005 | }; | 1001 | }; |
1006 | MODULE_DEVICE_TABLE(usb, device_table); | 1002 | MODULE_DEVICE_TABLE(usb, device_table); |
@@ -1025,7 +1021,7 @@ static int __init sd_mod_init(void) | |||
1025 | { | 1021 | { |
1026 | if (usb_register(&sd_driver) < 0) | 1022 | if (usb_register(&sd_driver) < 0) |
1027 | return -1; | 1023 | return -1; |
1028 | PDEBUG(D_PROBE, "v%s registered", version); | 1024 | PDEBUG(D_PROBE, "registered"); |
1029 | return 0; | 1025 | return 0; |
1030 | } | 1026 | } |
1031 | static void __exit sd_mod_exit(void) | 1027 | static void __exit sd_mod_exit(void) |