From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 12 Jan 2017 09:06:55 +0000 (+0100)
Subject: Remove kmod
X-Git-Tag: v226.4~1^2~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=1b383d7c9a38d90ec5e2def0738db95d01d723f5;p=elogind.git

Remove kmod
---

diff --git a/Makefile.am b/Makefile.am
index fb91eba36..bfade4309 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -775,7 +775,6 @@ substitutions = \
        '|SULOGIN=$(SULOGIN)|' \
        '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
-       '|KMOD=$(KMOD)|' \
        '|MKDIR_P=$(MKDIR_P)|' \
        '|QUOTAON=$(QUOTAON)|' \
        '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
diff --git a/src/basic/build.h b/src/basic/build.h
index 653a505e6..720ab21fb 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -111,12 +111,6 @@
 #define _ELFUTILS_FEATURE_ "-ELFUTILS"
 #endif
 
-#ifdef HAVE_KMOD
-#define _KMOD_FEATURE_ "+KMOD"
-#else
-#define _KMOD_FEATURE_ "-KMOD"
-#endif
-
 #ifdef HAVE_LIBIDN
 #define _IDN_FEATURE_ "+IDN"
 #else
@@ -139,5 +133,4 @@
         _SECCOMP_FEATURE_ " "                                           \
         _BLKID_FEATURE_ " "                                             \
         _ELFUTILS_FEATURE_ " "                                          \
-        _KMOD_FEATURE_ " "                                              \
         _IDN_FEATURE_
diff --git a/src/udev/udev.h b/src/udev/udev.h
index d17fc8c1e..60e5f1e20 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -149,9 +149,6 @@ enum udev_builtin_cmd {
         UDEV_BUILTIN_HWDB,
         UDEV_BUILTIN_INPUT_ID,
         UDEV_BUILTIN_KEYBOARD,
-#ifdef HAVE_KMOD
-        UDEV_BUILTIN_KMOD,
-#endif
         UDEV_BUILTIN_NET_ID,
         UDEV_BUILTIN_NET_LINK,
         UDEV_BUILTIN_PATH_ID,
@@ -177,9 +174,6 @@ 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;
 extern const struct udev_builtin udev_builtin_keyboard;
-#ifdef HAVE_KMOD
-extern const struct udev_builtin udev_builtin_kmod;
-#endif
 extern const struct udev_builtin udev_builtin_net_id;
 extern const struct udev_builtin udev_builtin_net_setup_link;
 extern const struct udev_builtin udev_builtin_path_id;