diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2015-02-11 18:40:16 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-02-11 18:40:16 -0500 |
| commit | 298f6c812890d5c372ab0eb2bcd75feec60e82ca (patch) | |
| tree | c113749e4bedbdd62cd1224353b15c72ab8e4b24 /src/udev | |
| parent | 79bf63bcff0c397b99626c845406d0b125c015a3 (diff) | |
src/udev/udev-builtin.c: remove legacy optional keymap
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/Makefile.am | 4 | ||||
| -rw-r--r-- | src/udev/udev-builtin.c | 2 | ||||
| -rw-r--r-- | src/udev/udev.h | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index 4a47f63063..b6583f0070 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -100,7 +100,7 @@ EXTRA_DIST = \ CLEANFILES = \ udev.pc -if ENABLE_KEYMAP + AM_CPPFLAGS += \ -I $(top_builddir)/src/udev @@ -133,8 +133,6 @@ CLEANFILES += \ keyboard-keys.txt \ $(BUILT_SOURCES) -endif - # install udevadm symlink in sbindir install-exec-hook: if test "$(bindir)" != "$(sbindir)"; then \ diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index 40dfeb6f30..82f644896c 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -36,9 +36,7 @@ static const struct udev_builtin *builtins[] = { [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, -#ifdef ENABLE_KEYMAP [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, -#endif #ifdef HAVE_KMOD [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod, #endif diff --git a/src/udev/udev.h b/src/udev/udev.h index 13bb1dc82a..198cb2c137 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -151,9 +151,7 @@ enum udev_builtin_cmd { UDEV_BUILTIN_BTRFS, UDEV_BUILTIN_HWDB, UDEV_BUILTIN_INPUT_ID, -#ifdef ENABLE_KEYMAP UDEV_BUILTIN_KEYBOARD, -#endif #ifdef HAVE_KMOD UDEV_BUILTIN_KMOD, #endif @@ -177,9 +175,7 @@ extern const struct udev_builtin udev_builtin_blkid; extern const struct udev_builtin udev_builtin_btrfs; extern const struct udev_builtin udev_builtin_hwdb; extern const struct udev_builtin udev_builtin_input_id; -#ifdef ENABLE_KEYMAP extern const struct udev_builtin udev_builtin_keyboard; -#endif #ifdef HAVE_KMOD extern const struct udev_builtin udev_builtin_kmod; #endif |