summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-25 08:24:53 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-25 08:24:53 +0000
commit3c8d2b9d38083b468f33531b9e0413aa15dec51d (patch)
treec6bcb7099d6bdd13db1305c1e6c29f1a72a2f61c
parent8853ce2d94cd86bc752fa8c7297f1082edf55859 (diff)
downloaddrakx-backup-do-not-use-3c8d2b9d38083b468f33531b9e0413aa15dec51d.tar
drakx-backup-do-not-use-3c8d2b9d38083b468f33531b9e0413aa15dec51d.tar.gz
drakx-backup-do-not-use-3c8d2b9d38083b468f33531b9e0413aa15dec51d.tar.bz2
drakx-backup-do-not-use-3c8d2b9d38083b468f33531b9e0413aa15dec51d.tar.xz
drakx-backup-do-not-use-3c8d2b9d38083b468f33531b9e0413aa15dec51d.zip
handle webcams managed by pwc driver
-rw-r--r--kernel/list_modules.pm2
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 13d496192..eb6cf4a37 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -142,7 +142,7 @@ our %l = (
qw(snd-au8810 snd-au8820 snd-au8830),
),
],
- tv => [ qw(bttv cpia_usb ibmcam mod_quickcam ov511 ov518_decomp ultracam usbvideo cyber2000fb saa7134) ],
+ tv => [ qw(bttv cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp pwc saa7134 ultracam usbvideo) ],
photo => [ qw(dc2xx mdc800) ],
radio => [ qw(radio-maxiradio) ],
scanner => [ qw(scanner microtek) ],
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 332fe36b1..a6cd517bb 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -63,7 +63,7 @@ our @tree =
[ "AUDIO", , N("Soundcard"), "sound.png", "$sbindir/draksound", sub { f(grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ } @devices) }, 0 ],
[ "WEBCAM", , N("Webcam"), "webcam.png", "", sub {
f(grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' ||
- member($_->{driver}, qw(cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp ultracam usbvideo)) } @devices) },
+ member($_->{driver}, qw(cpia_usb cyber2000fb ibmcam mod_quickcam ov511 ov518_decomp pwc ultracam usbvideo)) } @devices) },
0 ],
[ "CPU", , N("Processors"), "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
[ "ISDN", , N("ISDN adapters"), "modem.png", "$sbindir/drakconnect", sub { require network::isdn; my $isdn = network::isdn::isdn_detect_backend();