diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2019-12-26 17:09:36 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2019-12-26 17:09:36 +0000 |
| commit | 2899979df9b03e4c1fa45be3075dc8c47a11fdb5 (patch) | |
| tree | 060b8b5b58850d4f2d56235b8ce14a233681645b /sys/dev/hyperv | |
| parent | f46412c021efc761b9c313c1b3481e53d75e5e03 (diff) | |
| download | src-2899979df9b03e4c1fa45be3075dc8c47a11fdb5.tar.gz src-2899979df9b03e4c1fa45be3075dc8c47a11fdb5.zip | |
Revert r355806: kbd drivers: don't double register keyboard drivers
r356087 made it rather innocuous to double-register built-in keyboard
drivers; we now set a flag to indicate that it's been registered and only
act once on a registration anyways. There is no misleading here, as the
follow-up kbd_delete_driver will actually remove the driver as needed now
that the linker set isn't also consulted after kbdinit.
Notes
Notes:
svn path=/head/; revision=356091
Diffstat (limited to 'sys/dev/hyperv')
| -rw-r--r-- | sys/dev/hyperv/input/hv_kbd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/dev/hyperv/input/hv_kbd.c b/sys/dev/hyperv/input/hv_kbd.c index af3288139127..3be18da0efef 100644 --- a/sys/dev/hyperv/input/hv_kbd.c +++ b/sys/dev/hyperv/input/hv_kbd.c @@ -490,8 +490,6 @@ hv_kbd_intr(hv_kbd_sc *sc) int hvkbd_driver_load(module_t mod, int what, void *arg) { - -#ifdef KLD_MODULE switch (what) { case MOD_LOAD: kbd_add_driver(&hvkbd_kbd_driver); @@ -500,7 +498,6 @@ hvkbd_driver_load(module_t mod, int what, void *arg) kbd_delete_driver(&hvkbd_kbd_driver); break; } -#endif return (0); } |