diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/char/c-qcam.c | |
parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/char/c-qcam.c')
-rw-r--r-- | drivers/char/c-qcam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/c-qcam.c b/drivers/char/c-qcam.c index a69684110..e424266c8 100644 --- a/drivers/char/c-qcam.c +++ b/drivers/char/c-qcam.c @@ -727,7 +727,7 @@ int init_cqcam(struct parport *port) printk(KERN_INFO "Connectix Colour Quickcam on %s\n", qcam->pport->name); - if (video_register_device(&qcam->vdev)==-1) + if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER)==-1) { parport_unregister_device(qcam->pdev); kfree(qcam); |