summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
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 /mdk-stage1
parentc29d882a22faa99f246f94b760f4b93513ff3edc (diff)
downloaddrakx-backup-do-not-use-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar
drakx-backup-do-not-use-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar.gz
drakx-backup-do-not-use-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar.bz2
drakx-backup-do-not-use-d34ade51ae03bd7c4e854f8460896e7175aa6bef.tar.xz
drakx-backup-do-not-use-d34ade51ae03bd7c4e854f8460896e7175aa6bef.zip
- usbkbd is dead, using usbhid instead
(as told by pterjan)
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/probing.c5
2 files changed, 4 insertions, 3 deletions
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();
}