summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-20 12:06:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-20 12:06:42 +0000
commitd34ade51ae03bd7c4e854f8460896e7175aa6bef (patch)
treee3d2a83fe66a45260ea08948030d3946ad4ffae8
parentc29d882a22faa99f246f94b760f4b93513ff3edc (diff)
downloaddrakx-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar
drakx-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar.gz
drakx-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar.bz2
drakx-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar.xz
drakx-d34ade51ae03bd7c4e854f8460896e7175aa6bef.zip
- usbkbd is dead, using usbhid instead
(as told by pterjan)
-rw-r--r--kernel/list_modules.pm1
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/probing.c5
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/modules.pm2
5 files changed, 6 insertions, 5 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 9e15feaec..5504168e9 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -156,7 +156,6 @@ our %l = (
pcmcia => [
if_(arch() !~ /^sparc/, qw(au1x00_ss i82365 i82092 pd6729 tcic vrc4171_card vrc4173_cardu yenta_socket)), # cb_enabler
],
- usb_keyboard => [ qw(usbkbd keybdev) ],
#serial_cs
#ftl_cs 3c575_cb apa1480_cb epic_cb serial_cb tulip_cb iflash2+_mtd iflash2_mtd
#cb_enabler
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index f535b7454..599c9cd47 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- usbkbd is dead, using usbhid instead
+
1.30:
- add back "ide-generic" support (incorrectly removed in 1.17), the
module that we want to avoid is "ide-pci-generic" (previously "generic"),
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 01d71e59b..9dba6e6e8 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -294,7 +294,7 @@ void discovered_device(enum driver_type type, const char * description, const ch
#endif
#ifdef ENABLE_USB
if (type == USB_CONTROLLERS)
- /* we can't allow additional modules floppy since we need usbkbd for keystrokes of usb keyboards */
+ /* we can't allow additional modules floppy since we need usbhid for keystrokes of usb keyboards */
failed = my_insmod(driver, USB_CONTROLLERS, NULL, 0);
#endif
}
@@ -377,8 +377,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
}
wait_message("Detecting USB devices.");
sleep(4); /* sucking background work */
- my_insmod("usbkbd", ANY_DRIVER_TYPE, NULL, 0);
- my_insmod("keybdev", ANY_DRIVER_TYPE, NULL, 0);
+ my_insmod("usbhid", ANY_DRIVER_TYPE, NULL, 0);
remove_wait_message();
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e73cfdaac..8d7e08277 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- usbkbd is dead, using usbhid instead
- allow passing suppl=0 to disable "additional installation media" question
- drakx-in-chroot:
o fix using remote repositories
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index ba4b2a781..74fe8707d 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -267,7 +267,7 @@ sub when_load_category {
require fs::mount; fs::mount::usbfs('');
#- ensure keyboard is working, the kernel must do the job the BIOS was doing
sleep 4;
- load("usbkbd", "keybdev") if detect_devices::usbKeyboards();
+ load("usbhid") if detect_devices::usbKeyboards();
};
} elsif ($category eq 'bus/firewire') {
$conf->set_alias('ieee1394-controller', $name);