rules: remove pnp shell script, acpi loads these modules properly

diff --git a/TODO b/TODO
index 8986d19722cb6e9928d032ca248b8561dfdb7648..c06451dd6094bf95a1bf00bc7e29b309d70dc79b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 
   o convert firmware.sh to C
-  o drop pnp shell script, acpi will take care of loading pnp modules
   o add DVB variables to kernel (patch merged in v4l tree), drop the
     shell script rule
   o "udevadm control" commands will only accept the --<command> syntax

diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules
index 881d7581bfef8e1547fc0dcd65e5e1836eb463c9..ca0fa6bc424ab4806287aea2b430b7d730fd1d97 100644 (file)
--- a/rules/rules.d/80-drivers.rules
+++ b/rules/rules.d/80-drivers.rules
@@ -3,8 +3,6 @@
 ACTION!="add", GOTO="drivers_end"
 
 DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
-SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
-  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"