summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2015-02-11 18:06:47 -0500
committerAnthony G. Basile <blueness@gentoo.org>2015-02-11 18:06:47 -0500
commit79bf63bcff0c397b99626c845406d0b125c015a3 (patch)
tree0d3debfdd4f2017a2cca1d2c68dfae3e4c1af19c /rules
parent158c3f34cf25652aeb90ec4a24a6f5c7a5bd8f00 (diff)
src/udev/udev-builtin-kmod.c: remove the modprobe alt to kmod code
Diffstat (limited to 'rules')
-rw-r--r--rules/80-drivers-modprobe.rules13
-rw-r--r--rules/Makefile.am7
2 files changed, 1 insertions, 19 deletions
diff --git a/rules/80-drivers-modprobe.rules b/rules/80-drivers-modprobe.rules
deleted file mode 100644
index 14c5b873bb..0000000000
--- a/rules/80-drivers-modprobe.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION=="remove", GOTO="drivers_end"
-
-ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe ms_block mspro_block"
-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe ppdev"
-KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="/sbin/modprobe sm_ftl"
-
-LABEL="drivers_end"
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 408a23c976..15a3a903f4 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -26,14 +26,9 @@ dist_udevrules_DATA += \
60-persistent-storage.rules
endif
-if HAVE_MODULES
-if HAVE_LIBKMOD
+if HAVE_KMOD
dist_udevrules_DATA += \
80-drivers.rules
-else
-dist_udevrules_DATA += \
- 80-drivers-modprobe.rules
-endif
endif
if ENABLE_KEYMAP